From dce5fd232b347d9287a187bdd28702a17125dc52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Thu, 9 Jan 2025 11:03:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?2025-01-09=20MES=20-=20=E8=87=AA=E6=A3=80/?= =?UTF-8?q?=E9=A6=96=E6=A3=80=E4=B8=A4=E4=B8=AA=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/firstInspection/index.vue | 17 +++++++++++++++-- src/views/mes/selfMutualInspection/index.vue | 19 +++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/views/mes/firstInspection/index.vue b/src/views/mes/firstInspection/index.vue index 5b2f98f..6bcd8a9 100644 --- a/src/views/mes/firstInspection/index.vue +++ b/src/views/mes/firstInspection/index.vue @@ -445,7 +445,7 @@ export default { // 监听lineCode和checkDate的变化 headerParameters: { handler(newVal) { - if (newVal.lineCode && newVal.checkDate) { + if (newVal.lineCode || newVal.checkDate) { this.getProductList(); //监听产品和检查日期 } }, @@ -464,7 +464,7 @@ export default { } }, - //在选择设备时候，存设备名称 + //在选择产品时候，存产品名称 handleSelectProductChange(value) { const selectedOption = this.productCodeOption.find( (option) => option.id === value @@ -559,6 +559,19 @@ export default { getProductList() { getProductList(this.headerParameters).then((response) => { this.productCodeOption = response; + + if (response.length === 0) { + this.headerParameters.id = null; + // this.productCodeOption = null; + } else { + const found = this.productCodeOption.some( + (item) => item.id === this.headerParameters.id + ); + + if (!found) { + this.headerParameters.id = null; + } + } }); }, diff --git a/src/views/mes/selfMutualInspection/index.vue b/src/views/mes/selfMutualInspection/index.vue index 77f6566..0426872 100644 --- a/src/views/mes/selfMutualInspection/index.vue +++ b/src/views/mes/selfMutualInspection/index.vue @@ -445,7 +445,7 @@ export default { // 监听lineCode和checkDate的变化 headerParameters: { handler(newVal) { - if (newVal.lineCode && newVal.checkDate) { + if (newVal.lineCode || newVal.checkDate) { this.getProductList(); //监听产品和检查日期 } }, @@ -559,6 +559,19 @@ export default { getProductList() { getProductList(this.headerParameters).then((response) => { this.productCodeOption = response; + + if (response.length === 0) { + this.headerParameters.id = null; + // this.productCodeOption = null; + } else { + const found = this.productCodeOption.some( + (item) => item.id === this.headerParameters.id + ); + + if (!found) { + this.headerParameters.id = null; + } + } }); }, @@ -722,7 +735,9 @@ export default { checkTimeS === null || checkTimeS === "" ) { - this.$modal.msg("您填入的检查时间存在开始时间为空的情况，请再次进行填写！"); + this.$modal.msg( + "您填入的检查时间存在开始时间为空的情况，请再次进行填写！" + ); return; } } From 0341075c1669c03ff9e2c648952c7b167b427a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Thu, 9 Jan 2025 11:39:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?2025-1-9=20MES-=E7=82=B9=E6=A3=80=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/pointInspection/index.vue | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/views/mes/pointInspection/index.vue b/src/views/mes/pointInspection/index.vue index ddf712a..41e33d2 100644 --- a/src/views/mes/pointInspection/index.vue +++ b/src/views/mes/pointInspection/index.vue @@ -130,7 +130,7 @@ @change=" handleCheckboxChange( item, - 'openLine', + 'clearLine', key, $event.target.checked ) @@ -214,7 +214,7 @@ -
+
填写要求： 1.产线组长在开线、品种转换时填写该表。 @@ -251,7 +251,7 @@
表单编号:08GL05C001-014A

- + @@ -263,7 +263,9 @@
@@ -354,9 +356,9 @@
- -
-
+ +
+
填写要求： 1.产线组长在开线、品种转换时填写该表。 @@ -385,6 +387,7 @@ export default { printable: "printPage", ignore: ["no-print"], }, + currentSelectedRow: null, showPrintPage: false, showTable: false, lineCodeOption: [], @@ -444,19 +447,16 @@ export default { this.$set(item, "whetherOpenLine", false); } - this.tableData.forEach((dataItem) => { - Object.keys(dataItem).forEach((key) => { - if (key === transKey) { - this.$set(dataItem[transKey], "whetherOpenLine", newBz); - } + this.$nextTick(() => { + console.log("item", item); + this.tableData.forEach((dataItem) => { + Object.keys(dataItem).forEach((key) => { + if (key === transKey) { + this.$set(dataItem[transKey], "whetherOpenLine", newBz); + } + }); }); }); - - // this.tableData.forEach((dataItem) => { - // if (dataItem.hasOwnProperty(transKey)) { - // dataItem[transKey][whetherOpenLine] = newBz; - // } - // }); }, //在选择产线时候，存产线名称 From 46eff879a8485181d94f8b8e3a21e517d8a4a6a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Thu, 9 Jan 2025 17:11:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?2024-01-09=20=E8=AE=BE=E5=A4=87-=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E5=AE=A1=E6=A0=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/faultReport/index.vue | 178 ++++++++++++++++++------- 1 file changed, 131 insertions(+), 47 deletions(-) diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index 17c571b..11dcd38 100644 --- a/src/views/device/faultReport/index.vue +++ b/src/views/device/faultReport/index.vue @@ -228,10 +228,7 @@ fixed > - + - + - 计划性维修 - 立即维修 + 计划性维修 + 立即维修 不维修 委外维修 - + @@ -539,7 +539,9 @@ 是 - 否 + 否 @@ -617,11 +619,19 @@ 是 - 否 + 否 - + - + @@ -947,11 +963,43 @@ > - + + + + + + + + + + + + + + + { - this.form = response.data; - if (response.data.files != null) { - var newFiles = []; - response.data.files.forEach((item) => { - var newFile = {}; - newFile.name = item.fileName; - newFile.url = item.fileAddress; - newFiles.push(newFile); - }); - this.form.fileList = newFiles; - } + const orderStatus = row.orderStatus; + const orderSource = row.orderSource; + if (orderStatus === "1" || orderStatus === "0") { + Message.warning("该报修单已经审核过，不可修改!"); + } else if (orderSource === "点检" || orderSource === "巡检") { + Message.warning("点检、巡检报修信息自动生成,不可修改!"); + } else { + getFaultReport(orderId).then((response) => { + this.form = response.data; + if (response.data.files != null) { + var newFiles = []; + response.data.files.forEach((item) => { + var newFile = {}; + newFile.name = item.fileName; + newFile.url = item.fileAddress; + newFiles.push(newFile); + }); + this.form.fileList = newFiles; + } + }); - if ( - this.form.orderSource == "点检" || - this.form.orderSource == "巡检" - ) { - Message.warning("点检、巡检报修信息自动生成,不可修改!"); - } else { - this.open = true; - this.title = "修改故障报修"; - } - }); + this.open = true; + this.openUpdate = true; + this.openAdd = false; + this.title = "修改故障报修"; + } + + // if ( + // this.form.orderSource == "点检" || + // this.form.orderSource == "巡检" + // ) { + // Message.warning("点检、巡检报修信息自动生成,不可修改!"); + // } else { + // this.open = true; + // this.title = "修改故障报修"; + // } + + // if (this.form.orderStatus != "2" ) { + // Message.warning("该报修单已经审核过，不可修改!"); + // } else { + // this.open = true; + // this.title = "修改故障报修"; + // } }, + /** 查看按钮操作 */ handleView(row) { this.reset(); @@ -1781,7 +1861,11 @@ export default { if (valid) { if (this.form.orderId != null) { checkFaultReport(this.form).then((response) => { - this.$modal.msgSuccess("审核成功"); + if(response.code == 200){ + this.$modal.msgSuccess("审核成功"); + }else{ + Message.warning(response.msg); + } this.openCheck = false; this.getList(); }); From d6f45a63f6a69cae8a8a7a8d2ff9874c43db9b90 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 9 Jan 2025 17:26:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=88=90=E5=9E=8B=E6=9C=BA=E4=BA=A7?= =?UTF-8?q?=E9=87=8F=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/reportWorks.js | 17 +- src/api/quality/checkTypeProject.js | 5 +- src/views/mes/cxjProduction/index.vue | 264 +++++++++++++++++++ src/views/mes/hFProduction/index.vue | 38 ++- src/views/mes/hourProduction/index.vue | 47 +++- src/views/plan/workorder/index.vue | 1 + src/views/quality/checkTypeProject/index.vue | 23 +- src/views/quality/produceReport/index.vue | 20 +- 8 files changed, 375 insertions(+), 40 deletions(-) create mode 100644 src/views/mes/cxjProduction/index.vue diff --git a/src/api/mes/reportWorks.js b/src/api/mes/reportWorks.js index 4b44e92..316a9ec 100644 --- a/src/api/mes/reportWorks.js +++ b/src/api/mes/reportWorks.js @@ -16,7 +16,7 @@ export function getProductTraceList(query) { }); } -//查询烘房生产列表 +//查询烘房产量列表 export function getHFProductionList(query) { return request({ url: '/mes/reportWorks/getHFProductionList', @@ -31,3 +31,18 @@ export function getHFProductionTitle(query) { params: query }); } +//查询成型机产量列表 +export function getCXJProductionList(query) { + return request({ + url: '/mes/reportWorks/getCXJProductionList', + method: 'get', + params: query + }); +} +export function getCXJProductionTitle(query) { + return request({ + url: '/mes/reportWorks/getCXJProductionTitle', + method: 'get', + params: query + }); +} \ No newline at end of file diff --git a/src/api/quality/checkTypeProject.js b/src/api/quality/checkTypeProject.js index a5971d7..e4b0ea2 100644 --- a/src/api/quality/checkTypeProject.js +++ b/src/api/quality/checkTypeProject.js @@ -74,10 +74,11 @@ export function getProjectInfoList(query) { }); } //方案下拉 -export function getProjectOptions(query) { +export function getAutoDataOption(query) { return request({ - url: '/quality/checkTypeProject/getProjectOptions', + url: '/quality/checkTypeProject/getAutoDataOption', method: 'get', params: query }); } + diff --git a/src/views/mes/cxjProduction/index.vue b/src/views/mes/cxjProduction/index.vue new file mode 100644 index 0000000..beec889 --- /dev/null +++ b/src/views/mes/cxjProduction/index.vue @@ -0,0 +1,264 @@ + + + diff --git a/src/views/mes/hFProduction/index.vue b/src/views/mes/hFProduction/index.vue index 48dbf37..d5f2947 100644 --- a/src/views/mes/hFProduction/index.vue +++ b/src/views/mes/hFProduction/index.vue @@ -11,8 +11,8 @@ + + + + - - - 搜索 @@ -136,7 +153,11 @@ export default { // 表单参数 form: {}, // 班次list - workShift: [] + workShift: [], + equipmentTypeOption:[ + {equipmentTypeCode:"equ_type_cxj",equipmentTypeCode:"成型机"}, + {equipmentTypeCode:"equ_type_hf",equipmentTypeCode:"烘房"} + ] }; }, created() { @@ -270,7 +291,13 @@ export default { }); return sums; - } + }, + //在选择设备类型控制筛选条件 + //changeEquType(value) { + // if (value =='equ_type_cxj') { + // this.headerParameters.lineName = selectedOption.equipmentName; + // } + //} } }; diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index 896c6fe..c16e75e 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -251,6 +251,7 @@ + diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue index d564fbc..7642a73 100644 --- a/src/views/quality/checkTypeProject/index.vue +++ b/src/views/quality/checkTypeProject/index.vue @@ -103,6 +103,7 @@ v-loading="loading" :data="checkTypeProjectList" @selection-change="handleSelectionChange" + height="500" > {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}} - - + + @@ -222,8 +223,14 @@ - 是 - 否 + + +
@@ -247,7 +254,8 @@ import { addCheckTypeProject, updateCheckTypeProject, changeStatus, - submitProjects + submitProjects, + getAutoDataOption } from "@/api/quality/checkTypeProject"; import MaterialGroupAdd from "./MaterialGroupAdd.vue"; import {listCheckType} from "@/api/quality/checkType"; @@ -318,10 +326,15 @@ export default { { required: true, message: "检验项目id不能为空", trigger: "blur" }, ], }, + autoDataOption:[], }; }, created() { this.getProjectList(); + // 获取自动采集字典 + getAutoDataOption({dictType:'auto_data'}).then(response => { + this.autoDataOption = response + }) }, methods: { /**获取检测项目列表**/ diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 80f45f5..f1b70bc 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -97,6 +97,16 @@ v-hasPermi="['quality:produceReport:export']" >首检报告Excel下载 + + 巡检报告Excel下载 + @@ -184,7 +194,7 @@ - 生成车间:{{form.supplierName}} + 生产车间:{{form.supplierName}} 生成线体:{{form.lineName}} 检查日期:{{form.checkTimeStart}} 产品名称:{{form.materialName}} @@ -1083,6 +1093,14 @@ export default { ...this.queryParams }, `SCReportExport_${new Date().getTime()}.xlsx`) }, + /** 导出报告按钮操作 */ + handleSCXJReportExport() { + this.queryParams.orderNo = this.selectRow[0].orderNo; + this.queryParams.shiftId = this.selectRow[0].shiftId; + this.download('quality/qcProduceReport/SCXJReportExport', { + ...this.queryParams + }, `SCXJReportExport_${new Date().getTime()}.xlsx`) + }, /**获取检验项目列表 */ getCheckedProjectList(){ this.loading = true; From 41e0fb12339447a2206c81d95db7c283fefd6261 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 13 Jan 2025 10:19:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B4=A8=E9=87=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/reportWork/index.vue | 7 ++++++- src/views/quality/produceReport/index.vue | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 6d676e3..791f988 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -136,6 +136,11 @@ + + + item.recordId) this.single = selection.length!==1 this.multiple = !selection.length @@ -1087,19 +1089,31 @@ export default { }, /** 导出报告按钮操作 */ handleSCReportExport() { + if(this.excelFlag!='首件检验'){ + this.$modal.msgSuccess("请选择首件检验任务"); + return + } const recordId =this.ids[0]; this.queryParams.recordId = recordId; this.download('quality/qcProduceReport/SCReportExport', { ...this.queryParams - }, `SCReportExport_${new Date().getTime()}.xlsx`) + }, `SCReportExport_${new Date().getTime()}.xlsx`); + this.queryParams.recordId = ''; + }, /** 导出报告按钮操作 */ handleSCXJReportExport() { + if(this.excelFlag!='巡检检验'){ + this.$modal.msgSuccess("请选择巡检任务"); + return + } this.queryParams.orderNo = this.selectRow[0].orderNo; this.queryParams.shiftId = this.selectRow[0].shiftId; this.download('quality/qcProduceReport/SCXJReportExport', { ...this.queryParams - }, `SCXJReportExport_${new Date().getTime()}.xlsx`) + }, `SCXJReportExport_${new Date().getTime()}.xlsx`); + this.queryParams.orderNo = ''; + this.queryParams.shiftId = ''; }, /**获取检验项目列表 */ getCheckedProjectList(){