From 0cbca87e11507a2da889586bb219e6b5a799666b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Fri, 24 May 2024 10:48:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=B8=85=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20Type=201-=E6=88=90=E5=93=81=202-=E6=AF=9B=E5=9D=AF?= =?UTF-8?q?=20=E9=A6=96=E6=A3=80=EF=BC=8C=E7=BB=88=E6=A3=80=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=20=E6=88=90?= =?UTF-8?q?=E5=93=81=E5=BA=93=EF=BC=8C=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qualityManagement/firstFQC.js | 9 +++ src/views/qualityManagement/FQC/firstFQC.vue | 21 +++++ .../FQC/qualityStatistics.vue | 7 +- src/views/qualityManagement/FQC/thirtyFQC.vue | 53 +++++++++++-- .../wmsManagement/WmGoodsNowProduction.vue | 4 +- .../wmsManagement/WmGoodsOutProduction.vue | 4 +- src/views/wmsManagement/WmMaterial.vue | 77 +++++++++++-------- 7 files changed, 131 insertions(+), 44 deletions(-) diff --git a/src/api/qualityManagement/firstFQC.js b/src/api/qualityManagement/firstFQC.js index 58df818..ad79f27 100644 --- a/src/api/qualityManagement/firstFQC.js +++ b/src/api/qualityManagement/firstFQC.js @@ -56,4 +56,13 @@ export function writeProcessFlow_first(query) { method: 'get', params: query, }) +} + +//获取工单开始时间 string workOrderId +export function GetQcQualityStatisticsFirstStartTime(query) { + return request({ + url: '/mes/qc/FQC/getQcQualityStatisticsFirstStartTime', + method: 'get', + params: query, + }) } \ No newline at end of file diff --git a/src/views/qualityManagement/FQC/firstFQC.vue b/src/views/qualityManagement/FQC/firstFQC.vue index 1b1486e..d32905a 100644 --- a/src/views/qualityManagement/FQC/firstFQC.vue +++ b/src/views/qualityManagement/FQC/firstFQC.vue @@ -489,6 +489,8 @@ 抛光数 {{ calculate_defectNumber }} + 工单开始时间 + {{ workOrderStartTime }} @@ -514,6 +516,7 @@ get_previous_current_workorder, accumulator_query, writeProcessFlow_first, + GetQcQualityStatisticsFirstStartTime, } from '@/api/qualityManagement/firstFQC.js' import { mapState, mapGetters, mapMutations, mapActions } from 'vuex' export default { @@ -543,6 +546,8 @@ DMLdialog: { visiable: false, }, + // 工单开始时间 + workOrderStartTime: "", toUpdateNum: 0, //弹窗更新值 toname: '', toindex: 0, //索引 @@ -555,6 +560,22 @@ this.initMqtt(); this.getcurrentWorkorder() }, + watch: { + 'CurrentWorkorder.clientWorkorder'(newValue, oldValue) { + if (newValue == null) { + this.workOrderStartTime = ""; + return; + } + const data = { + workOrderId: newValue + } + GetQcQualityStatisticsFirstStartTime(data).then(res => { + if (res.code === 200) { + this.workOrderStartTime = res.data; + } + }) + } + }, mounted() {}, computed: { // 计算合格数 diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue index 278a8e4..a79d7b0 100644 --- a/src/views/qualityManagement/FQC/qualityStatistics.vue +++ b/src/views/qualityManagement/FQC/qualityStatistics.vue @@ -12,13 +12,13 @@ - + - + - + @@ -315,7 +315,6 @@ let query = { ...this.search, ...this.pagination } delete query['reportType'] delete query['total'] - console.log('query', query) switch (this.search.reportType) { case 0: GetQualityStatisticsTable_first(query).then((res) => { diff --git a/src/views/qualityManagement/FQC/thirtyFQC.vue b/src/views/qualityManagement/FQC/thirtyFQC.vue index 3c0bc88..265a88c 100644 --- a/src/views/qualityManagement/FQC/thirtyFQC.vue +++ b/src/views/qualityManagement/FQC/thirtyFQC.vue @@ -455,10 +455,6 @@ 上一个工单 - - - - 本工单完成 @@ -493,6 +489,17 @@ + + + + + +
报废数 {{ calculate_scrapNumber }}
标签参考图片 + + + + + 开始时间{{ workOrderStartTime }}
@@ -522,6 +529,9 @@ generateQualityStatisticsTable, } from '@/api/qualityManagement/thirtyFQC.js'; + import { + GetQcQualityStatisticsFirstStartTime, + } from '@/api/qualityManagement/firstFQC.js' import { convertToIncomingInspectionData } from '@/api/wmsManagement/wmFgentryInspect.js' export default { name: 'thirtyFQC', @@ -551,6 +561,8 @@ DMLdialog: { visiable: false, }, + // 工单开始时间 + workOrderStartTime: "", toUpdateNum: 0, //弹窗更新值 toname: '', toindex: 0, //索引 @@ -562,10 +574,28 @@ created() { this.initMqtt(); this.getcurrentWorkorder() + // this.startTimer() }, mounted() {}, - + watch: { + // 工单变动 + 'CurrentWorkorder.clientWorkorder'(newValue, oldValue) { + this.showBigImageView(); + if (newValue == null) { + this.workOrderStartTime = ""; + return; + } + const data = { + workOrderId: newValue + } + GetQcQualityStatisticsFirstStartTime(data).then(res => { + if (res.code === 200) { + this.workOrderStartTime = res.data; + } + }) + } + }, computed: { @@ -1098,11 +1128,22 @@ } this.mqttClient.publish(topic.OrderChange, emqxUtil.stringJSON(message)); } - } + }, + // 大图触发 + showBigImageView() { + this.$nextTick(() => { + this.$refs.elImageRef.clickHandler(); + }) + + }, }, + // 退出后关闭计时器 beforeDestroy() { this.stopTimer() }, + + + } diff --git a/src/views/wmsManagement/WmGoodsNowProduction.vue b/src/views/wmsManagement/WmGoodsNowProduction.vue index ffa70f7..17a2d32 100644 --- a/src/views/wmsManagement/WmGoodsNowProduction.vue +++ b/src/views/wmsManagement/WmGoodsNowProduction.vue @@ -100,7 +100,7 @@