From c858bae5d5eb251694c790fb09fd8cd680be422f Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 25 Apr 2024 14:19:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=20-=20=E4=B8=8D=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E5=93=81=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/report/exceptionProcess.js | 44 ++ src/api/report/switchOrder.js | 44 ++ src/views/report/exceptionProcess/index.vue | 705 ++++++++++++++++++ .../report/exceptionProcess/processReport.vue | 676 +++++++++++++++++ src/views/report/switchOrder/index.vue | 452 +++++++++++ 5 files changed, 1921 insertions(+) create mode 100644 src/api/report/exceptionProcess.js create mode 100644 src/api/report/switchOrder.js create mode 100644 src/views/report/exceptionProcess/index.vue create mode 100644 src/views/report/exceptionProcess/processReport.vue create mode 100644 src/views/report/switchOrder/index.vue diff --git a/src/api/report/exceptionProcess.js b/src/api/report/exceptionProcess.js new file mode 100644 index 0000000..3690c54 --- /dev/null +++ b/src/api/report/exceptionProcess.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询不合格品流程管理列表 +export function listExceptionProcess(query) { + return request({ + url: '/report/exceptionProcess/list', + method: 'get', + params: query + }) +} + +// 查询不合格品流程管理详细 +export function getExceptionProcess(objId) { + return request({ + url: '/report/exceptionProcess/' + objId, + method: 'get' + }) +} + +// 新增不合格品流程管理 +export function addExceptionProcess(data) { + return request({ + url: '/report/exceptionProcess', + method: 'post', + data: data + }) +} + +// 修改不合格品流程管理 +export function updateExceptionProcess(data) { + return request({ + url: '/report/exceptionProcess', + method: 'put', + data: data + }) +} + +// 删除不合格品流程管理 +export function delExceptionProcess(objId) { + return request({ + url: '/report/exceptionProcess/' + objId, + method: 'delete' + }) +} diff --git a/src/api/report/switchOrder.js b/src/api/report/switchOrder.js new file mode 100644 index 0000000..13e49e8 --- /dev/null +++ b/src/api/report/switchOrder.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询切换订单管理列表 +export function listSwitchOrder(query) { + return request({ + url: '/report/switchOrder/list', + method: 'get', + params: query + }) +} + +// 查询切换订单管理详细 +export function getSwitchOrder(objId) { + return request({ + url: '/report/switchOrder/' + objId, + method: 'get' + }) +} + +// 新增切换订单管理 +export function addSwitchOrder(data) { + return request({ + url: '/report/switchOrder', + method: 'post', + data: data + }) +} + +// 修改切换订单管理 +export function updateSwitchOrder(data) { + return request({ + url: '/report/switchOrder', + method: 'put', + data: data + }) +} + +// 删除切换订单管理 +export function delSwitchOrder(objId) { + return request({ + url: '/report/switchOrder/' + objId, + method: 'delete' + }) +} diff --git a/src/views/report/exceptionProcess/index.vue b/src/views/report/exceptionProcess/index.vue new file mode 100644 index 0000000..2eb63c6 --- /dev/null +++ b/src/views/report/exceptionProcess/index.vue @@ -0,0 +1,705 @@ + + + diff --git a/src/views/report/exceptionProcess/processReport.vue b/src/views/report/exceptionProcess/processReport.vue new file mode 100644 index 0000000..311bf8c --- /dev/null +++ b/src/views/report/exceptionProcess/processReport.vue @@ -0,0 +1,676 @@ + + + diff --git a/src/views/report/switchOrder/index.vue b/src/views/report/switchOrder/index.vue new file mode 100644 index 0000000..e85b979 --- /dev/null +++ b/src/views/report/switchOrder/index.vue @@ -0,0 +1,452 @@ + + + From 66023beb4f2617be81ff4f191e5e8d503884d5fd Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 26 Apr 2024 16:10:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=20-=20=E5=88=87=E6=8D=A2=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/exceptionProcess/index.vue | 48 ++++----- src/views/report/switchOrder/index.vue | 112 ++++++++++---------- 2 files changed, 82 insertions(+), 78 deletions(-) diff --git a/src/views/report/exceptionProcess/index.vue b/src/views/report/exceptionProcess/index.vue index 2eb63c6..47d1ca4 100644 --- a/src/views/report/exceptionProcess/index.vue +++ b/src/views/report/exceptionProcess/index.vue @@ -123,18 +123,18 @@ - + - - + + - + @@ -165,7 +165,7 @@ v-if="productionManagerVisible && scope.row.productionManagerFlag == null && scope.row.qualityUserFlag != null && scope.row.productionUserFlag === '1'" @click="productionManagerUpdate(scope.row)" - >生产经理评审 + >生产部经理评审 质量经理评审 + >质量部经理评审 @@ -272,7 +272,7 @@ - + @@ -307,7 +307,7 @@ - + - + @@ -359,7 +359,7 @@ - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -85,7 +85,7 @@ 新增--> - - 修改 - - + + + + + + + + + + + + - - - + + + + + + + + - - - - - - @@ -211,26 +210,26 @@ - + - + - - + + + + + + + + - - - - - - - + @@ -243,7 +242,7 @@ - + @@ -270,7 +269,7 @@ import { export default { name: 'SwitchOrder', - dicts: ['is_flag'], + dicts: ['is_switch'], data() { return { // 遮罩层 @@ -302,6 +301,7 @@ export default { objId: null, materialBarcode: null, switchStationCode: null, + switchStationName: null, oldOrderCode: null, isSwitch: null, createBy: null, @@ -314,11 +314,15 @@ export default { // 表单参数 form: {}, // 表单校验 - rules: {}, + rules: { + oldOrderCode: [ + { required: true, message: '新订单编号不能为空', trigger: 'blur' } + ], + }, columns: [ { key: 0, label: `主键标识`, visible: false }, { key: 1, label: `箱体码`, visible: true }, - { key: 2, label: `切换工位编号`, visible: true }, + { key: 2, label: `切换工位`, visible: true }, { key: 3, label: `原订单编号`, visible: false }, { key: 4, label: `切换订单标识`, visible: true }, { key: 5, label: `创建人`, visible: false }, @@ -416,7 +420,7 @@ export default { if (valid) { if (this.form.objId != null) { updateSwitchOrder(this.form).then(response => { - this.$modal.msgSuccess('修改成功') + this.$modal.msgSuccess('修改SAP订单成功，请到打印机旁进行补打条码！') this.open = false this.getList() }) From 9fbaa544c391a21f51f927a3851ee1971f295fc8 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 26 Apr 2024 17:42:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=20-=20=E6=B6=88=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 67 ++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b893f27..83c7656 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -56,6 +56,9 @@ import SizeSelect from '@/components/SizeSelect' import Search from '@/components/HeaderSearch' import RuoYiGit from '@/components/RuoYi/Git' import RuoYiDoc from '@/components/RuoYi/Doc' +import { parseTime } from '@//utils/ruoyi' +import { listExceptionProcess } from '@//api/report/exceptionProcess' +import { getInfo } from '@//api/login' export default { components: { @@ -91,7 +94,71 @@ export default { } } }, + data() { + return { + // 查询参数 + queryParams: { + pageNum: 1, + pageSize: 10, + productionUserFlag: '1', + }, + // 用户岗位List + postList: [], + } + }, + created() { + this.openAlarm() + //获取用户岗位 10=生产班长,81=质量管理员,5=生产部经理,6=质量部经理 + getInfo().then(res => { + this.postList = res.postList + if (this.postList.includes(81)) { + this.queryParams.qualityUserFlag = '9' + this.exceptionProcessTask(); + }else if (this.postList.includes(5)) { + this.queryParams.productionManagerFlag = '9' + this.exceptionProcessTask(); + }else if (this.postList.includes(6)) { + this.queryParams.qualityManagerFlag = '9' + this.exceptionProcessTask(); + } + }) + }, methods: { + // 不合格品流程任务 + exceptionProcessTask() { + let self = this; + let params = { ...this.queryParams } + listExceptionProcess(params).then(response => { + if (response.total > 0){ + self.openAlarm(); + } + }) + setInterval(function() { + listExceptionProcess(params).then(response => { + if (response.total > 0){ + self.openAlarm(); + } + }) + }, 300000); + }, + // 打开右下角异常 + openAlarm() { + this.$notify({ + title: "不合格流程待处理提示", + position: "bottom-right", + message: this.$createElement( + "div", + { + on: { + click: () => { + this.$tab.openPage("不合格品流程管理","/quality/exceptionProcess", null); + }, + }, + }, + [this.$createElement("el-button", {}, ["点击查看"])] + ), + }); + }, toggleSideBar() { this.$store.dispatch('app/toggleSideBar') }, From 883b083d7f1147fd55a7e4a5cce675c9e2cd9093 Mon Sep 17 00:00:00 2001 From: yinq Date: Sun, 28 Apr 2024 15:09:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=20-=20=E6=B6=88=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 1 - src/views/report/exceptionProcess/index.vue | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 83c7656..cdc5f99 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -107,7 +107,6 @@ export default { } }, created() { - this.openAlarm() //获取用户岗位 10=生产班长,81=质量管理员,5=生产部经理,6=质量部经理 getInfo().then(res => { this.postList = res.postList diff --git a/src/views/report/exceptionProcess/index.vue b/src/views/report/exceptionProcess/index.vue index 47d1ca4..e8dd9d6 100644 --- a/src/views/report/exceptionProcess/index.vue +++ b/src/views/report/exceptionProcess/index.vue @@ -123,13 +123,13 @@ - + - + @@ -148,7 +148,7 @@ - +