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 @@ - + - +
- + - - 搜索 - - 重置 - + + 搜索 + + 重置 + @@ -44,22 +44,22 @@ - + - + - + :filter-method="filterTag" + filter-placement="bottom-end"> @@ -90,7 +90,6 @@ :limit.sync="listQuery.page_size" @pagination="getList" /> - @@ -119,36 +118,36 @@ - 搜索 - - 重置 - + v-model="listQuery2.search" + placeholder="半成品名称/编号/子计划编号/工序" + style="width: 300px" + class="filter-item" + @keyup.enter.native="handleFilter2" + /> + 搜索 + + 重置 + @@ -158,7 +157,7 @@ - + @@ -166,15 +165,15 @@ {{ actstate_[scope.row.act_state] }} - + + :filter-method="filterTag"> @@ -206,37 +205,37 @@ 批量入库 - - 搜索 - - 重置 - + + 搜索 + + 重置 + - + @@ -259,15 +258,15 @@ {{ actstate_[scope.row.act_state] }} - + + :filter-method="filterTag"> @@ -297,36 +296,36 @@ - - 搜索 - - 重置 - + + 搜索 + + 重置 + @@ -341,14 +340,14 @@ {{ actstate_[scope.row.act_state] }} - + + :filter-method="filterTag"> @@ -356,7 +355,7 @@ {{ ng_sign_[scope.row.ng_sign] }} - + @@ -390,26 +389,23 @@ - - - - + @@ -417,26 +413,25 @@ {{ actstate_[scope.row.act_state] }} - + - + { text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]" :filter-method="filterTag"> @@ -624,7 +619,7 @@
- 取 消 + 取 消 确 定
@@ -779,8 +774,8 @@ import checkPermission from "@/utils/permission"; import customForm from '@/components/customForm/index'; import reviewForm from '@/components/customForm/review'; - import { createTicket, getWorkflowInit} from "@/api/workflow"; - import { getrecordformList, getrffieldList} from "@/api/mtm"; + import {createTicket, getWorkflowInit} from "@/api/workflow"; + import {getrecordformList, getrffieldList} from "@/api/mtm"; import {getwproductList, wproductPutin, createputins, testInit, scrap, getRetrial} from "@/api/wpm"; import {getTestRecord, getTestRecordItem, putTestRecordItem, delTestRecordItem, subTestRecordItem} from "@/api/qm"; // import {genTree} from "@/utils"; @@ -829,7 +824,7 @@ page: 1, page_size: 20, }, - activeName: "1", + activeName: "1", create_by_: '', update_time: '', formLabelWidth: '', @@ -943,30 +938,21 @@ }, methods: { checkPermission, - handleClick(tab) { + handleClick(tab) { this.listLoading = true; this.listQuery.type = tab.name; - if(tab.name==1) - { - this.getList(); + 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(); } - 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() { @@ -979,12 +965,12 @@ this.listLoading = false; }); }, - handleFilter1() { + handleFilter1() { this.listQuery.page = 1; this.getList(); }, resetFilter1() { - + this.listQuery = { page: 1, page_size: 20, @@ -1019,12 +1005,12 @@ } }); }, - handleFilter2() { + handleFilter2() { this.listQuery2.page = 1; this.getList2(); }, resetFilter2() { - + this.listQuery2 = { page: 1, page_size: 20, @@ -1042,12 +1028,12 @@ }); }, - handleFilter3() { + handleFilter3() { this.listQuery1.page = 1; this.getList1(); }, resetFilter3() { - + this.listQuery1 = { page: 1, page_size: 20, @@ -1065,12 +1051,12 @@ }); }, - handleFilter4() { + handleFilter4() { this.listQuery4.page = 1; this.getList4(); }, resetFilter4() { - + this.listQuery4 = { page: 1, page_size: 20, @@ -1152,7 +1138,7 @@ }); }, //筛选 - filterTag(value, row) { + filterTag(value, row) { return row.step_.name === value; }, //夹层半成品列表 @@ -1204,7 +1190,11 @@ // this.outerVisible = true; that.wproduct = scope.row.id;//半成品ID that.listQueryrecordform.material = scope.row.material; - that.listQueryrecordform.type = 20; + if (index === '3') { + that.listQueryrecordform.type = 40; + } else { + that.listQueryrecordform.type = 20; + } that.listQueryrecordform.enabled = true; that.recordform = null; getrecordformList(that.listQueryrecordform).then((response) => { @@ -1251,8 +1241,8 @@ that.recordId = scope.row.id; that.recordform = scope.row.form; that.formName = scope.row.form_.name; - if(that.innerIndex==='1'){//非复检 - getrffieldList({form: this.recordform,enabled:true, page: 1, page_size: 100}).then((response) => { + if (that.innerIndex !== '2') {//非复检 + getrffieldList({form: this.recordform, enabled: true, page: 1, page_size: 100}).then((response) => { if (response.data) { that.hasPicture = false; let fieldList = response.data.results; @@ -1378,7 +1368,7 @@ this.outerVisible = false; that.fieldList = []; if (that.recordform != "") { - if (index === '1') {//非复检 + if (index !== '2') {//非复检 testInit({wproduct: that.wproduct, form: that.recordform}).then((response) => { if (response.data) { that.hasPicture = false; diff --git a/hb_client/src/views/wpm/productjy.vue b/hb_client/src/views/wpm/productjy.vue index 98eb3ad..ac9eb72 100644 --- a/hb_client/src/views/wpm/productjy.vue +++ b/hb_client/src/views/wpm/productjy.vue @@ -18,7 +18,6 @@ scope.row.material_.name }} - @@ -27,7 +26,6 @@ {{ actstate_[scope.row.act_state] }} - @@ -59,14 +57,11 @@ /> - 批量入库 - - - - - -