From b095b6a12ae03323ac576ade81edd1c5e5a33c56 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Mon, 11 Dec 2023 09:10:05 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device/upkeepPlan.js | 8 ++++++++ src/views/device/upkeepOrder/index.vue | 4 ++-- src/views/device/upkeepPlan/index.vue | 25 ++++++++++++++++++------- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/api/device/upkeepPlan.js b/src/api/device/upkeepPlan.js index 6f03617..fdd6297 100644 --- a/src/api/device/upkeepPlan.js +++ b/src/api/device/upkeepPlan.js @@ -17,6 +17,14 @@ export function formatEquItem(data) { data: data }); } +// 处理计划-设备信息 +export function formatEquItemNoCondition(data) { + return request({ + url: '/device/upkeepPlan/formatEquItemNoCondition', + method: 'post', + data: data + }); +} // 查询保养计划列表 export function listUpkeepPlan(query) { diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index 1df03c0..615f92f 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -1169,7 +1169,7 @@ import { addUpkeepOrder, updateUpkeepOrder, subInspect } from "@/api/device/upkeepOrder"; -import {formatEquItem, querySpareList} from "@/api/device/upkeepPlan"; +import {formatEquItem, formatEquItemNoCondition, querySpareList} from "@/api/device/upkeepPlan"; import {getEquList, getPersonList, getWorkCenter} from "@/api/device/plan"; import {delDeviceOrder, getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder"; import {getInspectionWork, updateInspectionWork} from "@/api/device/inspectionWork"; @@ -1636,7 +1636,7 @@ export default { this.form.equipmentItem = []; // 处理信息 - formatEquItem(this.selectEquList).then(response => { + formatEquItemNoCondition(this.selectEquList).then(response => { for (let i = 0; i < response.data.length; i++) { this.form.equipmentItem.push(response.data[i]); diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue index be0c414..e79f265 100644 --- a/src/views/device/upkeepPlan/index.vue +++ b/src/views/device/upkeepPlan/index.vue @@ -873,7 +873,7 @@ import { delUpkeepPlan, addUpkeepPlan, updateUpkeepPlan, - formatEquItem, setSpareList, querySpareList + formatEquItem, setSpareList, querySpareList, formatEquItemNoCondition } from "@/api/device/upkeepPlan"; import { addPlan, @@ -1401,14 +1401,25 @@ export default { } // 处理信息 - formatEquItem(this.selectEquList).then(response => { + if (this.form.calculationRule == "2"){ + formatEquItem(this.selectEquList).then(response => { - for (let i = 0; i < response.data.length; i++) { - this.form.equipmentItem.push(response.data[i]); - } + for (let i = 0; i < response.data.length; i++) { + this.form.equipmentItem.push(response.data[i]); + } - this.selectEqu = false; - }) + this.selectEqu = false; + }) + }else { + formatEquItemNoCondition(this.selectEquList).then(response => { + + for (let i = 0; i < response.data.length; i++) { + this.form.equipmentItem.push(response.data[i]); + } + + this.selectEqu = false; + }) + } }, // 选择设备多选操作 From 48cba41dce490457580e7524bce16821e17ef142 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 11 Dec 2023 10:43:40 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device/item.js | 24 + src/views/device/repairOrder/index.vue | 1 - src/views/device/summaryReport/index.vue | 665 ++++++++++++++++++ .../summaryReport/selectSingleEquipment.vue | 296 ++++++++ 4 files changed, 985 insertions(+), 1 deletion(-) create mode 100644 src/views/device/summaryReport/index.vue create mode 100644 src/views/device/summaryReport/selectSingleEquipment.vue diff --git a/src/api/device/item.js b/src/api/device/item.js index 9e977fc..078f576 100644 --- a/src/api/device/item.js +++ b/src/api/device/item.js @@ -58,3 +58,27 @@ export function delItem(itemId) { method: 'delete' }); } +/////////////////////////////////////////下面都是汇总报表用 +// 查询检查项汇总表 +export function getSummaryReport() { + return request({ + url: '/device/item/summaryReport', + method: 'get' + }); +} + +// 查询工作中心 +export function getWorkCenter() { + return request({ + url: '/device/item/getWorkCenter', + method: 'get' + }); +} + +// 查询工单匹配检查项 +export function selectMatchList(query) { + return request({ + url: '/device/item/matchList', + params: query + }); +} diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 45d07a4..d23430d 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -1126,7 +1126,6 @@ > -
diff --git a/src/views/device/summaryReport/index.vue b/src/views/device/summaryReport/index.vue new file mode 100644 index 0000000..a37dff7 --- /dev/null +++ b/src/views/device/summaryReport/index.vue @@ -0,0 +1,665 @@ + + + + + diff --git a/src/views/device/summaryReport/selectSingleEquipment.vue b/src/views/device/summaryReport/selectSingleEquipment.vue new file mode 100644 index 0000000..d35b063 --- /dev/null +++ b/src/views/device/summaryReport/selectSingleEquipment.vue @@ -0,0 +1,296 @@ + + + From c9d0e531f01278f0acc0bca655c185c2276f88d0 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 11 Dec 2023 12:05:22 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/checkTypeProject.js | 18 ++ src/views/mes/reportWork/index.vue | 2 +- src/views/quality/checkTypeProject/index.vue | 53 ++++-- .../checkTypeProject/selectProject.vue | 170 ++++++++++++++++++ src/views/quality/project/index.vue | 11 +- src/views/quality/qcProduce/index.vue | 7 +- src/views/quality/qcWarehousing/index.vue | 124 ++++++++----- .../quality/qcWarehousing/selectWorkOrder.vue | 139 ++++++++++++++ src/views/technology/proroute/index.vue | 2 +- 9 files changed, 463 insertions(+), 63 deletions(-) create mode 100644 src/views/quality/checkTypeProject/selectProject.vue create mode 100644 src/views/quality/qcWarehousing/selectWorkOrder.vue diff --git a/src/api/quality/checkTypeProject.js b/src/api/quality/checkTypeProject.js index 1346424..429d0d3 100644 --- a/src/api/quality/checkTypeProject.js +++ b/src/api/quality/checkTypeProject.js @@ -55,3 +55,21 @@ export function changeStatus(id,status) { data: data }); } + +//批量添加检测项 +export function submitProjects(data) { + return request({ + url: '/quality/checkTypeProject/submitProjects', + method: 'post', + data: data + }); +} + +//获取检测项列表 +export function getProjectInfoList(query) { + return request({ + url: '/quality/checkTypeProject/getProjectInfoList', + method: 'get', + params: query + }); +} \ No newline at end of file diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 140df50..aafa55b 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -773,7 +773,7 @@ export default { return; } const values = data.map(item => Number(item[column.property])); - if (!values.every(value => isNaN(value))) { + if (!values.every(value => isNaN(value))&& column.label!='用人数') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr); if (!isNaN(value)) { diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue index 35d6af4..3db50c2 100644 --- a/src/views/quality/checkTypeProject/index.vue +++ b/src/views/quality/checkTypeProject/index.vue @@ -105,8 +105,8 @@ @selection-change="handleSelectionChange" > - - + + @@ -221,6 +221,11 @@ 取 消
+ + @@ -231,16 +236,17 @@ import { delCheckTypeProject, addCheckTypeProject, updateCheckTypeProject, - changeStatus + changeStatus, + submitProjects } from "@/api/quality/checkTypeProject"; import MaterialGroupAdd from "./MaterialGroupAdd.vue"; import {listCheckType} from "@/api/quality/checkType"; import {getProjectList} from "@/api/quality/project"; - +import SelectProject from "./selectProject.vue"; export default { name: "CheckTypeProject", dicts: ["qc_rule_prop",'unit'], - components: {MaterialGroupAdd,}, + components: {MaterialGroupAdd,SelectProject}, data() { return { // 遮罩层 @@ -355,6 +361,7 @@ export default { groupId: null, materialCode: null, projectNo: null, + projectInfos:[] }; this.resetForm("form"); }, @@ -414,12 +421,17 @@ export default { }, /** 新增按钮操作 */ handleAdd() { - this.reset(); - this.open = true; - this.title = "添加物料检验项目维护"; - this.form.groupId = this.groupId; - this.form.materialCode = this.materialCode; - this.form.typeId = this.editableTabsValue; + + if(this.groupId==null||this.materialCode){ + this.$modal.msgError("请点击左侧节点"); + return + }; + if(this.queryParams.typeId==null){ + this.$modal.msgError("请选择头部节点"); + retrun + }; + this.$refs.child.showFlag = true; + this.$refs.child.init(this.groupId,this.materialCode,this.queryParams.typeId); }, /** 修改按钮操作 */ handleUpdate(row) { @@ -525,6 +537,25 @@ export default { row.status = row.status === "0" ? "1" : "0"; }); }, + //检验项目添加确认 + onSelectProjects(objs) { + let _this = this; + objs.forEach(function(item,index,arr){ + item.projectId = item.id; + item.projectNo = item.orderNum; + item.unit = item.unitCode; + item.standardValue = item.checkStandard; + item.typeId = _this.queryParams.typeId; + item.groupId = _this.groupId; + item.materialCode = _this.materialCode; + + }); + submitProjects(objs).then(response => { + this.$modal.msgSuccess("提交成功"); + this.open = false; + this.getList(); + }); + }, }, }; diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue new file mode 100644 index 0000000..7a30708 --- /dev/null +++ b/src/views/quality/checkTypeProject/selectProject.vue @@ -0,0 +1,170 @@ + + diff --git a/src/views/quality/project/index.vue b/src/views/quality/project/index.vue index 8d4d886..3540349 100644 --- a/src/views/quality/project/index.vue +++ b/src/views/quality/project/index.vue @@ -92,8 +92,8 @@ - - + + - + From c79a9c4d0019a2e464fef3404cf56636464ddf47 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 11 Dec 2023 14:08:53 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E5=A4=9A=E7=85=A7=E7=89=87=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/repairOrder/index.vue | 75 ++++++++++++++++---------- 1 file changed, 48 insertions(+), 27 deletions(-) diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index d23430d..df17742 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -799,7 +799,7 @@ @@ -807,10 +807,10 @@ {{ form.workCode @@ -876,8 +876,8 @@ + - + @@ -1490,15 +1476,28 @@ export default { CS: { "text-align": "center", }, + CS1: { + "text-align": "center", + width: "250px", + }, LS: { "text-align": "center", width: "225px", }, + LS1: { + "text-align": "center", + width: "250px", + }, //图片表格样式 LSP: { "text-align": "center", width: "225px", }, + //图片表格样式 + LSP1: { + "text-align": "center", + width: "250px", + }, //检查项表格数据 detailList: [], //维修前照片 @@ -1818,6 +1817,7 @@ export default { this.openAdd = true; this.title = "快速工单"; }, + /** 填写按钮操作 */ handleWrite(row) { this.reset(); @@ -1894,7 +1894,18 @@ export default { standard.repairValue = item.repairValue; standard.repairReach = item.repairReach; standard.standardType = item.standardType; - //检查项图片 + + if (item.picturePaths != null) { + var newFiles = []; + item.picturePaths.forEach((item) => { + var newFile = {}; + newFile.name = item.fileName; + newFile.url = item.fileAddress; + newFiles.push(newFile); + }); + standard.picturePath = newFiles; + } + //检查项图片显示 var standardUrlLists = []; if (item.picturePaths != null) { item.picturePaths.forEach((item2) => { @@ -1985,12 +1996,22 @@ export default { this.form.afterRepairFile ); } - this.form.faultType = this.form.faultType.join(","); + + if (this.form.faultType != null) { + this.form.faultType = this.form.faultType.join(","); + } + console.log(this.form.faultType); this.$refs["form"].validate((valid) => { if (valid) { if (this.form.workId != null) { this.form.standardList = this.detailList; + //每个检查项 + this.form.standardList.forEach((item) => { + if (Array.isArray(item.picturePath)) { + item.picturePath = this.listToString(item.picturePath); + } + }); console.log(this.form.standardList); writeRepairOrder(this.form).then((response) => { this.openWrite = false; From 15080fa7b22cdb09a716044d7b82c049d6b1b375 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 11 Dec 2023 14:40:36 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=BB=86=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/repairOrder/index.vue | 81 +++++++++++-------- .../device/repairOrder/selectSpareParts.vue | 5 ++ 2 files changed, 53 insertions(+), 33 deletions(-) diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index df17742..8623238 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -1055,7 +1055,7 @@ - + @@ -1069,7 +1069,7 @@ - + @@ -1275,6 +1275,7 @@ + @@ -161,7 +162,7 @@ - + @@ -724,7 +725,7 @@ export default { var y = dd.getFullYear(); var m = dd.getMonth() + 1;//获取当前月份的日期 var d = dd.getDate(); - return y + "-" + m + "-" + d+" 00:00:00"; + return y + "-" + m + "-" + d; }, /** 查询报工报表列表 */ @@ -736,8 +737,8 @@ export default { }**/ if(this.queryParams.feedbackTimeArray !=null && this.queryParams.feedbackTimeArray.length>0){ - this.queryParams.feedbackTimeStart = moment(this.queryParams.feedbackTimeArray[0]).format('YYYY-MM-DD 00:00:00'); - this.queryParams.feedbackTimeEnd = moment(this.queryParams.feedbackTimeArray[1]).format('YYYY-MM-DD 23:59:59'); + this.queryParams.feedbackTimeStart = moment(this.queryParams.feedbackTimeArray[0]).format('YYYY-MM-DD'); + this.queryParams.feedbackTimeEnd = moment(this.queryParams.feedbackTimeArray[1]).format('YYYY-MM-DD'); } this.loading = true; listReportWork(this.queryParams).then(response => { diff --git a/src/views/quality/qcIncome/selectMaterial.vue b/src/views/quality/qcIncome/selectMaterial.vue index bf9f8db..07aab87 100644 --- a/src/views/quality/qcIncome/selectMaterial.vue +++ b/src/views/quality/qcIncome/selectMaterial.vue @@ -150,7 +150,6 @@ export default { this.selectedRows.name = this.idsName; this.$emit('onSelected', this.selectedRows); this.showFlag = false; - this.queryParams.itemCodeGet = ""; } } }; From 58a9afa5926f4006f4dab157b642b985670f2766 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Wed, 13 Dec 2023 09:06:00 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/item/index.vue | 16 ++++++++-------- src/views/device/upkeepOrder/index.vue | 10 ++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue index 2c4b78b..990f93b 100644 --- a/src/views/device/item/index.vue +++ b/src/views/device/item/index.vue @@ -310,14 +310,14 @@ - - - + + + diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index 615f92f..c254d5e 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -43,7 +43,7 @@ @keyup.enter.native="handleQuery" /> - + - + - + - + Date: Wed, 13 Dec 2023 10:14:03 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=84=E7=BA=BF/?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/equipment/index.vue | 46 +++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index c3905d7..b245ff6 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -59,6 +59,22 @@ /> + + + + + + - + + + + + + + + + + + + + @@ -910,7 +952,7 @@ import ItemSelectPerson from "./single.vue"; export default { name: "Equipment", - dicts: ["sys_normal_disable", "equ_type", "equipment_status"], + dicts: ["sys_normal_disable", "equ_type", "equipment_status","equipment_category"], components: { EquipmentSpareParts ,ItemSelectPerson}, data() { return { From b94f46231633f1f92a8fa4ee22fc91241777664d Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 13 Dec 2023 14:56:39 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E8=AE=BE=E5=A4=87=E7=BB=84=E7=BA=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/equipment.js | 9 ++ src/views/wms/equipment/index.vue | 113 +++++++++------- src/views/wms/equipment/itemEquipment.vue | 123 ++++++++++++++++++ .../equipment/{single.vue => itemPerson.vue} | 0 4 files changed, 201 insertions(+), 44 deletions(-) create mode 100644 src/views/wms/equipment/itemEquipment.vue rename src/views/wms/equipment/{single.vue => itemPerson.vue} (100%) diff --git a/src/api/wms/equipment.js b/src/api/wms/equipment.js index 3030ae8..b746322 100644 --- a/src/api/wms/equipment.js +++ b/src/api/wms/equipment.js @@ -105,3 +105,12 @@ export function getPersonList(query) { params: query }); } + +// 查询设备管理列表 +export function getAuxiliaryEquipmentList(query) { + return request({ + url: '/wms/equipment/getAuxiliaryEquipmentList', + method: 'get', + params: query + }); +} diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index b245ff6..028480f 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -12,7 +12,7 @@ @@ -22,7 +22,7 @@ v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable - style="width: 180px" + style="width: 200px" @keyup.enter.native="handleQuery" /> @@ -33,7 +33,7 @@ @change="$forceUpdate()" clearable filterable - style="width: 180px" + style="width: 200px" @keyup.enter.native="handleQuery" > - + - + - +