diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js index 4147e89..4aa2481 100644 --- a/hb_client/src/router/index.js +++ b/hb_client/src/router/index.js @@ -250,7 +250,7 @@ export const asyncRoutes = [ path: 'firstCheck', name: 'firstCheck', component: () => import('@/views/wpm/firstCheck'), - meta: { title: '首件确认', icon: 'finishedCheck', perms: ['wpm_firstCheck'] } + meta: { title: '首件确认', icon: 'finishedCheck', perms: ['wpm_firstCheck'] ,noCache: true} } ] diff --git a/hb_client/src/views/bigScreen/index.vue b/hb_client/src/views/bigScreen/index.vue index 2a0fcf1..d78a676 100644 --- a/hb_client/src/views/bigScreen/index.vue +++ b/hb_client/src/views/bigScreen/index.vue @@ -121,6 +121,10 @@ bottomLeft, bottomRight }, + created(){ + window.open('http://49.232.14.174:2222/#/index'); + this.$router.go(-1) + }, mounted() { this.timeFn(); this.cancelLoading(); diff --git a/hb_client/src/views/system/perm.vue b/hb_client/src/views/system/perm.vue index 8b474e0..7aaae2f 100644 --- a/hb_client/src/views/system/perm.vue +++ b/hb_client/src/views/system/perm.vue @@ -86,10 +86,10 @@ - + - +
- - + + + + 搜索 + + 重置 + {{ scope.row.material_.specification }} - + @@ -32,7 +54,12 @@ - + @@ -89,10 +116,31 @@ - + + + 搜索 + + 重置 + - + @@ -148,13 +201,34 @@ /> - + 批量入库 + + 搜索 + + 重置 + - + @@ -216,10 +295,31 @@ /> - + + + 搜索 + + 重置 + - + @@ -283,10 +387,10 @@ /> - + - + @@ -516,7 +624,7 @@
- 取 消 + 取 消 确 定
@@ -721,6 +829,7 @@ page: 1, page_size: 20, }, + activeName: "1", create_by_: '', update_time: '', formLabelWidth: '', @@ -825,15 +934,40 @@ computed: {}, watch: {}, created() { - this.getList(); - this.getList2(); - this.getList1(); - this.getList3(); - this.getList4(); + this.getList();//待检 + this.getList2();//复检 + this.getList1();//已合格 + this.getList3();//夹层 + this.getList4();//不合格 // this.getLists(); }, methods: { checkPermission, + handleClick(tab) { + this.listLoading = true; + this.listQuery.type = tab.name; + if(tab.name==1) + { + this.getList(); + } + else if(tab.name==2) + { + this.getList2(); + } + else if(tab.name==3) + { + this.getList1(); + } + else if(tab.name==4) + { + this.getList4(); + } + else if(tab.name==5) + { + this.getList3(); + } + + }, //待检半成品列表 getList() { this.listLoading = true; @@ -844,6 +978,18 @@ } this.listLoading = false; }); + }, + handleFilter1() { + this.listQuery.page = 1; + this.getList(); + }, + resetFilter1() { + + this.listQuery = { + page: 1, + page_size: 20, + }; + this.getList(); }, //待检半成品报废 handleScrapbcp(scope) { @@ -872,6 +1018,18 @@ this.wproductList2 = response.data; } }); + }, + handleFilter2() { + this.listQuery2.page = 1; + this.getList2(); + }, + resetFilter2() { + + this.listQuery2 = { + page: 1, + page_size: 20, + }; + this.getList2(); }, //已合格半成品 getList1() { @@ -883,6 +1041,18 @@ } }); + }, + handleFilter3() { + this.listQuery1.page = 1; + this.getList1(); + }, + resetFilter3() { + + this.listQuery1 = { + page: 1, + page_size: 20, + }; + this.getList1(); }, //不合格半成品 getList4() { @@ -894,6 +1064,18 @@ } }); + }, + handleFilter4() { + this.listQuery4.page = 1; + this.getList4(); + }, + resetFilter4() { + + this.listQuery4 = { + page: 1, + page_size: 20, + }; + this.getList4(); }, //不合格半成品报废 handleScrap(scope) { @@ -969,6 +1151,10 @@ } }); }, + //筛选 + filterTag(value, row) { + return row.step_.name === value; + }, //夹层半成品列表 getList3() { this.listQuery3.act_state = 26; diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue index 3ae609d..88e9ca0 100644 --- a/hb_client/src/views/wpm/operationdo.vue +++ b/hb_client/src/views/wpm/operationdo.vue @@ -1144,12 +1144,33 @@ export default { //提交本次操作 handlesubmit() { - submitOperation(this.id).then((res) => { + + + if(this.inputData=="") + { + this.$confirm("没有消耗物料确定提交吗?", "提示", { + confirmButtonText: "确认", + cancelButtonText: "取消", + type: "error", + }) + .then(async () => { + await submitOperation(this.id); + this.$router.push({ name: "operation" }); + this.$message.success("操作提交成功！"); + }) + .catch((err) => { + console.error(err); + }); + } + else{ + submitOperation(this.id).then((res) => { if (res.code >= 200) { this.$router.push({ name: "operation" }); this.$message.success("操作提交成功！"); } }); + } + }, }, };