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/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index b893f27..cdc5f99 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,70 @@ export default {
}
}
},
+ data() {
+ return {
+ // 查询参数
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ productionUserFlag: '1',
+ },
+ // 用户岗位List
+ postList: [],
+ }
+ },
+ created() {
+ //获取用户岗位 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')
},
diff --git a/src/views/report/exceptionProcess/index.vue b/src/views/report/exceptionProcess/index.vue
new file mode 100644
index 0000000..e8dd9d6
--- /dev/null
+++ b/src/views/report/exceptionProcess/index.vue
@@ -0,0 +1,705 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增审批流程
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.applyTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 质管员评审
+
+ 生产部经理评审
+
+ 质量部经理评审
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.applyTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.productionManagerTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.qualityManagerTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+ {{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+ {{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+ 修改SAP订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+