From d914decf5f719ad92becfbc7421f720abd4804b6 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Sun, 4 Feb 2024 16:15:10 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"4=E4=BA=BA=E4=B8=80=E5=B1=8F=20?= =?UTF-8?q?=E9=80=9A=E8=BF=87watch=E6=9D=A5=E8=A7=A3=E5=86=B3=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 195bcdba6c2a9a75d024f9c1703c7a7ef2bfc817. --- src/store/getters.js | 6 +- src/store/modules/quality.js | 50 +++-------- src/views/qualityManagement/FQC/firstFQC.vue | 95 ++++++++++++++------ 3 files changed, 79 insertions(+), 72 deletions(-) diff --git a/src/store/getters.js b/src/store/getters.js index 6e73b68..3864314 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -19,8 +19,8 @@ const getters = { onlineUserNum: (state) => state.socket.onlineNum, noticeList: (state) => state.socket.noticeList, //质量管理模块 - currentWorkOrder_first: (state) => state.quality.currentWorkOrder_first, - currentWorkOrder_again: (state) => state.quality.currentWorkOrder_again, - currentWorkOrder_thirty: (state) => state.quality.currentWorkOrder_thirty, + currentWorkOrder_first: (state) => state.socket.currentWorkOrder_first, + currentWorkOrder_again: (state) => state.socket.currentWorkOrder_again, + currentWorkOrder_thirty: (state) => state.socket.currentWorkOrder_thirty, } export default getters diff --git a/src/store/modules/quality.js b/src/store/modules/quality.js index db628f0..7b1e1c5 100644 --- a/src/store/modules/quality.js +++ b/src/store/modules/quality.js @@ -1,8 +1,4 @@ // 质量模块 共享变量 - -import { get_next_current_workorder, get_previous_current_workorder } from '@/api/qualityManagement/firstFQC.js' -import { Message, Notify } from 'element-ui' - const state = { currentWorkOrder_first: null, // 当前工单(首检) currentWorkOrder_again: null, // 当前工单(二检) @@ -22,47 +18,21 @@ const mutations = { } const actions = { - /* 首检 */ - - // 获取上一个工单 - Get_previous_currentWorkOrder_first({ commit }, data) { - get_previous_current_workorder().then((res) => { - if (res.code == 200) { - if (res.data != null) { - commit('SET_currentWorkOrder_first', res.data) - Message.success('获取工单号成功') - } else { - Notify.warning('没有生产工单') - } - } else if (res.code == 210) { - Notify.warning('没有生产工单') - } - }) + change__currentWorkOrder_first({ commit }, data) { + commit('SET_currentWorkOrder_first', data) }, - //获取下一个工单 - Get_next_current_workorder_first({ commit }, data) { - get_next_current_workorder().then((res) => { - if (res.code == 200) { - if (res.data != null) { - commit('SET_currentWorkOrder_first', res.data) - Message.success('获取工单号成功') - } else { - Notify.warning('已经是最后一个工单，没有工单了') - } - } else if (res.code == 210) { - Notify.warning('已经是最后一个工单，没有工单了') - } - }) + change__currentWorkOrder_again({ commit }, data) { + commit('SET_currentWorkOrder_again', data) }, - change__currentWorkOrder_thirty({ commit }, data) { commit('SET_currentWorkOrder_thirty', data) }, } + export default { - namespaced: true, - state, - mutations, - actions, -} + namespaced: true, + state, + mutations, + actions + } diff --git a/src/views/qualityManagement/FQC/firstFQC.vue b/src/views/qualityManagement/FQC/firstFQC.vue index 2ee3a54..7387938 100644 --- a/src/views/qualityManagement/FQC/firstFQC.vue +++ b/src/views/qualityManagement/FQC/firstFQC.vue @@ -546,35 +546,13 @@ export default { toUpdateNum: 0, //弹窗更新值 toname: '', toindex: 0, //索引 - timer: null, //定时器 + timer: null,//定时器 } }, created() { this.getcurrentWorkorder() }, mounted() {}, - watch: { - '$store.getters.currentWorkOrder_first': { - handler(newValue, oldValue) { - this.CurrentWorkorder = newValue - //获取检测项 - GetcheckItemTable({ workorderID: this.CurrentWorkorder.clientWorkorder }).then((result) => { - if (result.code == 200) { - this.paint = result.data.paint - - this.device = result.data.device - - this.blank = result.data.blank - - this.program = result.data.program - - this.team = result.data.team - this.$loading().close() - } - }) - }, - }, - }, computed: { // 计算合格数 calculate_firstPassNumber() { @@ -705,8 +683,9 @@ export default { return this.CurrentWorkorder.defectNumber }, }, - methods: { + ...mapActions({ change_polish_total_number: 'inspection/change_polish_total_number' }), + //todo 获取当前工单检测项及其数量 /* getCheckItemList() { // 1.拿到工单 @@ -747,6 +726,7 @@ export default { if (res.code == 200) { if (res.data != undefined) { this.CurrentWorkorder = res.data + this.$message.success('更新今日工单号成功') this.$loading() return GetcheckItemTable({ workorderID: this.CurrentWorkorder.clientWorkorder }) @@ -758,9 +738,13 @@ export default { .then((result) => { if (result.code == 200) { this.paint = result.data.paint + this.device = result.data.device + this.blank = result.data.blank + this.program = result.data.program + this.team = result.data.team this.$loading().close() } @@ -774,13 +758,64 @@ export default { }, //todo 获取下一个工单号 getNext_current_workorder() { - this.$store.dispatch('quality/Get_next_current_workorder_first') - this.$loading() + get_next_current_workorder() + .then((res) => { + if (res.code == 200) { + if (res.data != null) { + this.CurrentWorkorder = res.data + this.$loading() + this.$message.success('获取工单号成功') + + return GetcheckItemTable({ workorderID: this.CurrentWorkorder.clientWorkorder }) + } else { + this.$notify.warning('已经是最后一个工单，没有工单了') + } + } else if (res.code == 210) { + this.$notify.warning('已经是最后一个工单，没有工单了') + } + }) + .then((result) => { + if (result.code == 200) { + this.paint = result.data.paint + + this.device = result.data.device + + this.blank = result.data.blank + + this.program = result.data.program + + this.team = result.data.team + this.$loading().close() + } + }) }, //todo 获取上一个工单号 getPrevious_current_workorder() { - this.$store.dispatch('quality/Get_previous_currentWorkOrder_first') - this.$loading() + get_previous_current_workorder() + .then((res) => { + if (res.code == 200) { + if (res.data != null) { + this.CurrentWorkorder = res.data + this.$loading() + this.$message.success('获取工单号成功') + return GetcheckItemTable({ workorderID: this.CurrentWorkorder.clientWorkorder }) + } else { + this.$notify.warning('没有生产工单') + } + } else if (res.code == 210) { + this.$notify.warning('没有生产工单') + } + }) + .then((result) => { + if (result.code == 200) { + this.paint = result.data.paint + this.device = result.data.device + this.blank = result.data.blank + this.program = result.data.program + this.team = result.data.team + this.$loading().close() + } + }) }, //todo 累加器 这里是值传递还是引用传递？？？？？？？？？？？？？？？？？？？？？？？？？？？？？？ @@ -883,11 +918,12 @@ export default { this.DMLdialog.visiable = false }, - //todo 定时任务 ，每4s 获取一次当前工单 + //todo 定时任务 ，每4s 获取一次当前工单 startTimer() { this.timer = setInterval(() => { //this.getcurrentWorkorder() + }, 4000) }, stopTimer() { @@ -897,6 +933,7 @@ export default { beforeDestroy() { this.stopTimer() }, + }