From 9c0e859f2fc469d7511c24ca22e5391a9edff52b Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Fri, 2 Feb 2024 15:17:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=BA=BA=E4=B8=80=E5=B1=8F=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=E5=89=8D=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/getters.js | 10 ++--- src/store/index.js | 4 +- src/store/modules/quality.js | 38 +++++++++++++++++++ src/views/productManagement/workorder2.vue | 10 +++-- src/views/qualityManagement/FQC/againFQC.vue | 6 +-- src/views/qualityManagement/FQC/firstFQC.vue | 6 +-- src/views/qualityManagement/FQC/thirtyFQC.vue | 6 ++- 7 files changed, 62 insertions(+), 18 deletions(-) create mode 100644 src/store/modules/quality.js diff --git a/src/store/getters.js b/src/store/getters.js index 6c55599..3864314 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -18,11 +18,9 @@ const getters = { sidebarRouters: (state) => state.permission.sidebarRouters, onlineUserNum: (state) => state.socket.onlineNum, noticeList: (state) => state.socket.noticeList, - counterList_v1: (state) => state.socket.counter_v1, - counterList_v2: (state) => state.socket.counter_v2, - counterList_v3: (state) => state.socket.counter_v3, - - - + //质量管理模块 + 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/index.js b/src/store/index.js index ecbbcd7..84024a5 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -6,6 +6,7 @@ import tagsView from './modules/tagsView' import permission from './modules/permission' import settings from './modules/settings' import socket from './modules/socket' +import quality from './modules/quality' import getters from './getters' Vue.use(Vuex) @@ -23,7 +24,8 @@ const store = new Vuex.Store({ tagsView, permission, settings, - socket + socket, + quality, }, state: state,//这里放全局参数 getters diff --git a/src/store/modules/quality.js b/src/store/modules/quality.js new file mode 100644 index 0000000..7b1e1c5 --- /dev/null +++ b/src/store/modules/quality.js @@ -0,0 +1,38 @@ +// 质量模块 共享变量 +const state = { + currentWorkOrder_first: null, // 当前工单(首检) + currentWorkOrder_again: null, // 当前工单(二检) + currentWorkOrder_thirty: null, // 当前工单(三检) +} + +const mutations = { + SET_currentWorkOrder_first: (state, data) => { + state.currentWorkOrder_first = data + }, + SET_currentWorkOrder_again: (state, data) => { + state.currentWorkOrder_again = data + }, + SET_currentWorkOrder_thirty: (state, data) => { + state.currentWorkOrder_thirty = data + }, +} + +const actions = { + change__currentWorkOrder_first({ commit }, data) { + commit('SET_currentWorkOrder_first', data) + }, + 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 + } diff --git a/src/views/productManagement/workorder2.vue b/src/views/productManagement/workorder2.vue index f7a8e93..f2535a2 100644 --- a/src/views/productManagement/workorder2.vue +++ b/src/views/productManagement/workorder2.vue @@ -88,9 +88,13 @@ :data="workorder_table_data" > - - - + + + + + diff --git a/src/views/qualityManagement/FQC/againFQC.vue b/src/views/qualityManagement/FQC/againFQC.vue index 31a46c3..6fbec11 100644 --- a/src/views/qualityManagement/FQC/againFQC.vue +++ b/src/views/qualityManagement/FQC/againFQC.vue @@ -627,7 +627,7 @@ 上一个工单 - 本工单完成 + 本工单完成 @@ -927,7 +927,7 @@ export default { }, //todo 工单完成 workOrderCompleted() { - this.$modal.confirm('是否确认完成的数据项？').then(() => { + this.$modal.confirm('是否确认完成本工单？').then(() => { this.getNext_current_workorder() }) }, @@ -1180,7 +1180,7 @@ export default { grid-template-rows: 1fr 1fr 1fr; grid-gap: 0.5em; .title_Line { - color: #409eff; + color: #fff; font-family: Arial, sans-serif; font-size: 1.2rem; text-align: center; diff --git a/src/views/qualityManagement/FQC/firstFQC.vue b/src/views/qualityManagement/FQC/firstFQC.vue index 941dced..7387938 100644 --- a/src/views/qualityManagement/FQC/firstFQC.vue +++ b/src/views/qualityManagement/FQC/firstFQC.vue @@ -447,7 +447,7 @@ 上一个工单 - 本工单完成 + 本工单完成
产品描述
@@ -752,7 +752,7 @@ export default { }, //todo 工单完成 workOrderCompleted() { - this.$modal.confirm('是否确认完成的数据项？').then(() => { + this.$modal.confirm('是否确认完成本工单？').then(() => { this.getNext_current_workorder() }) }, @@ -995,7 +995,7 @@ export default { grid-template-rows: 1fr 1fr 1fr; grid-gap: 0.5em; .title_Line { - color: #409eff; + color: #fff; font-family: Arial, sans-serif; font-size: 1.2rem; text-align: center; diff --git a/src/views/qualityManagement/FQC/thirtyFQC.vue b/src/views/qualityManagement/FQC/thirtyFQC.vue index ea913de..8eecf22 100644 --- a/src/views/qualityManagement/FQC/thirtyFQC.vue +++ b/src/views/qualityManagement/FQC/thirtyFQC.vue @@ -634,7 +634,7 @@ 上一个工单 - 本工单完成 + 本工单完成
产品描述
@@ -898,7 +898,7 @@ export default { //todo 工单完成 workOrderCompleted() { this.$modal - .confirm('是否确认完成的数据项？') + .confirm('是否确认完成本工单？') .then(() => { this.getNext_current_workorder() //todo 更改这个工单状态为2 @@ -907,6 +907,7 @@ export default { .then((res) => { if (res.code == 200) { this.$notify.success('工单完成') + } }) }, @@ -917,6 +918,7 @@ export default { if (res.code == 200) { if (res.data != null) { this.CurrentWorkorder = res.data + this.$store.dispatch('quality/currentWorkOrder_thirty', res.data) this.$loading() this.$message.success('获取工单号成功')
产品描述