diff --git a/fe/PDA/common/basic.js b/fe/PDA/common/basic.js index 00297af75..87e769587 100644 --- a/fe/PDA/common/basic.js +++ b/fe/PDA/common/basic.js @@ -10,6 +10,7 @@ export function getJobStatuStyle(val) { else if (val == 8) return 'close' else if (val == 9) return 'cancelled ' else if (val == 30) return 'close' + else if (val == 31) return 'agvWait' } //任务状态 //open pending completed close @@ -22,6 +23,7 @@ export function getJobStatuDesc(val) { else if (val == 8) return '关闭' else if (val == 9) return '作废' else if (val == 30) return '待库移' + else if (val == 31) return '待AGV库移' else return '其他' } @@ -484,10 +486,17 @@ export function deepCopyData(target) { //发料任务列表状态 export function getIssueJobState(val) { if (val == 0) return 'ALL' - else if (val == 1) return 'Open' - else if (val == 2) return 'Wait' + else if (val == 1) return 'WaitAgv' + else if (val == 2) return 'Open' + else if (val == 3) return 'Wait' } +// export function getIssueJobState(val) { +// if (val == 0) return 31 +// else if (val == 1) return 1 +// else if (val == 2) return 30 +// } + const S4 = function() { return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1); }; diff --git a/fe/PDA/common/pdabasic.css b/fe/PDA/common/pdabasic.css index 49101bcd8..5c21adfda 100644 --- a/fe/PDA/common/pdabasic.css +++ b/fe/PDA/common/pdabasic.css @@ -301,6 +301,11 @@ background-color: #ececec; color: #666; } +.agvWait { + background-color: #00B6FF ; + color: fff; +} + /* 检验任务状态 */ /* 免检 */ diff --git a/fe/PDA/pages/task/assembleIssueJob.vue b/fe/PDA/pages/task/assembleIssueJob.vue index b50a03e2c..ae0c69acf 100644 --- a/fe/PDA/pages/task/assembleIssueJob.vue +++ b/fe/PDA/pages/task/assembleIssueJob.vue @@ -71,7 +71,7 @@ isToday: false, titleArray: ['任务编号'], loadingType: "nomore", - taps:["全部","待处理","待库移"], + taps:["全部","待AGV库移","待处理","待库移"], current:0 }; }, @@ -101,7 +101,6 @@ onClickItem(item) { this.current = item.currentIndex; var jobState =getIssueJobState(this.current) - console.log("点击", this.current) this.getList("refresh",jobState); }, openScanPopup() { diff --git a/fe/PDA/pages/task/assembleIssueJobDetail.vue b/fe/PDA/pages/task/assembleIssueJobDetail.vue index cb1fd41e9..76c2640ea 100644 --- a/fe/PDA/pages/task/assembleIssueJobDetail.vue +++ b/fe/PDA/pages/task/assembleIssueJobDetail.vue @@ -356,7 +356,11 @@ this.datacontent.jobStatus = 2 //承接并且承接人是自己显示，不是自己隐藏 if (this.datacontent.claimsUserId == localStorage.getItem('userId')) { - this.showBtn = true + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false } @@ -366,9 +370,13 @@ if (callback) { this.datacontent.isClaims = true; this.datacontent.jobStatus = 2 - this.showBtn = true this.datacontent.claimsUserName = localStorage.getItem('userName') this.datacontent.claimsUserId = localStorage.getItem('userId') + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false this.datacontent.isClaims = false; diff --git a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue index ce77eb896..049f849c4 100644 --- a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue +++ b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue @@ -361,7 +361,11 @@ this.datacontent.jobStatus =2 //承接并且承接人是自己显示，不是自己隐藏 if (this.datacontent.claimsUserId == localStorage.getItem('userId')) { - this.showBtn = true + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false } @@ -371,9 +375,13 @@ if (callback) { this.datacontent.isClaims = true; this.datacontent.jobStatus = 2 - this.showBtn = true this.datacontent.claimsUserName = localStorage.getItem('userName') this.datacontent.claimsUserId = localStorage.getItem('userId') + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false this.datacontent.isClaims = false; diff --git a/fe/PDA/pages/task/coatingIssuleJob.vue b/fe/PDA/pages/task/coatingIssuleJob.vue index 255e45e34..ffe53df3a 100644 --- a/fe/PDA/pages/task/coatingIssuleJob.vue +++ b/fe/PDA/pages/task/coatingIssuleJob.vue @@ -75,7 +75,7 @@ isToday: false, titleArray: ['任务编号'], loadingType: "nomore", - taps:["全部","待处理","待库移"], + taps:["全部","待AGV库移","待处理","待库移"], current:0 }; }, diff --git a/fe/PDA/pages/task/coatingIssuleJobDetail.vue b/fe/PDA/pages/task/coatingIssuleJobDetail.vue index 7ece146d8..d38a98d4f 100644 --- a/fe/PDA/pages/task/coatingIssuleJobDetail.vue +++ b/fe/PDA/pages/task/coatingIssuleJobDetail.vue @@ -359,7 +359,11 @@ this.datacontent.jobStatus = 2 //承接并且承接人是自己显示，不是自己隐藏 if (this.datacontent.claimsUserId == localStorage.getItem('userId')) { - this.showBtn = true + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false } @@ -369,9 +373,13 @@ if (callback) { this.datacontent.isClaims = true; this.datacontent.jobStatus = 2 - this.showBtn = true this.datacontent.claimsUserName = localStorage.getItem('userName') this.datacontent.claimsUserId = localStorage.getItem('userId') + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false this.datacontent.isClaims = false; diff --git a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue index 3224be762..25b1a51d3 100644 --- a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue +++ b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue @@ -374,7 +374,11 @@ this.datacontent.jobStatus =2 //承接并且承接人是自己显示，不是自己隐藏 if (this.datacontent.claimsUserId == localStorage.getItem('userId')) { - this.showBtn = true + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false } @@ -384,9 +388,13 @@ if (callback) { this.datacontent.isClaims = true; this.datacontent.jobStatus = 2 - this.showBtn = true this.datacontent.claimsUserName = localStorage.getItem('userName') this.datacontent.claimsUserId = localStorage.getItem('userId') + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false this.datacontent.isClaims = false; diff --git a/fe/PDA/pages/task/injectionIssueJob.vue b/fe/PDA/pages/task/injectionIssueJob.vue index a50a3d992..71fe840ad 100644 --- a/fe/PDA/pages/task/injectionIssueJob.vue +++ b/fe/PDA/pages/task/injectionIssueJob.vue @@ -72,7 +72,7 @@ isToday: false, titleArray: ['任务编号'], loadingType: "nomore", - taps:["全部","待处理","待库移"], + taps:["全部","待AGV库移","待处理","待库移"], current:0 }; }, diff --git a/fe/PDA/pages/task/injectionIssueJobDetail.vue b/fe/PDA/pages/task/injectionIssueJobDetail.vue index 514b1f9f6..49ed721ce 100644 --- a/fe/PDA/pages/task/injectionIssueJobDetail.vue +++ b/fe/PDA/pages/task/injectionIssueJobDetail.vue @@ -361,7 +361,12 @@ this.datacontent.jobStatus = 2 //承接并且承接人是自己显示，不是自己隐藏 if (this.datacontent.claimsUserId == localStorage.getItem('userId')) { - this.showBtn = true + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } + } else { this.showBtn = false } @@ -372,9 +377,13 @@ if (callback) { this.datacontent.isClaims = true; this.datacontent.jobStatus = 2 - this.showBtn = true this.datacontent.claimsUserName = localStorage.getItem('userName') this.datacontent.claimsUserId = localStorage.getItem('userId') + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false this.datacontent.isClaims = false; diff --git a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue index 796956ea1..27ff49324 100644 --- a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue +++ b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue @@ -357,7 +357,11 @@ this.datacontent.jobStatus = 2 //承接并且承接人是自己显示，不是自己隐藏 if (this.datacontent.claimsUserId == localStorage.getItem('userId')) { - this.showBtn = true + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false } @@ -367,9 +371,13 @@ if (callback) { this.datacontent.isClaims = true; this.datacontent.jobStatus = 2 - this.showBtn = true this.datacontent.claimsUserName = localStorage.getItem('userName') this.datacontent.claimsUserId = localStorage.getItem('userId') + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false this.datacontent.isClaims = false; diff --git a/fe/PDA/pages/task/kittingIssueJob.vue b/fe/PDA/pages/task/kittingIssueJob.vue index 1cf5525ea..c8a474ff0 100644 --- a/fe/PDA/pages/task/kittingIssueJob.vue +++ b/fe/PDA/pages/task/kittingIssueJob.vue @@ -71,7 +71,7 @@ isToday: false, titleArray: ['任务编号'], loadingType: "nomore", - taps:["全部","待处理","待库移"], + taps:["全部","待AGV库移","待处理","待库移"], current:0 }; }, diff --git a/fe/PDA/pages/task/kittingIssueJobDetail.vue b/fe/PDA/pages/task/kittingIssueJobDetail.vue index fada3b2b1..3237e462e 100644 --- a/fe/PDA/pages/task/kittingIssueJobDetail.vue +++ b/fe/PDA/pages/task/kittingIssueJobDetail.vue @@ -357,7 +357,11 @@ this.datacontent.jobStatus =2 //承接并且承接人是自己显示，不是自己隐藏 if (this.datacontent.claimsUserId == localStorage.getItem('userId')) { - this.showBtn = true + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false } @@ -367,9 +371,13 @@ if (callback) { this.datacontent.isClaims = true; this.datacontent.jobStatus = 2 - this.showBtn = true this.datacontent.claimsUserName = localStorage.getItem('userName') this.datacontent.claimsUserId = localStorage.getItem('userId') + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false this.datacontent.isClaims = false; diff --git a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue index ef29ef839..84aad5f68 100644 --- a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue +++ b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue @@ -359,7 +359,11 @@ this.datacontent.jobStatus =2 //承接并且承接人是自己显示，不是自己隐藏 if (this.datacontent.claimsUserId == localStorage.getItem('userId')) { - this.showBtn = true + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false } @@ -369,9 +373,13 @@ if (callback) { this.datacontent.isClaims = true; this.datacontent.jobStatus = 2 - this.showBtn = true this.datacontent.claimsUserName = localStorage.getItem('userName') this.datacontent.claimsUserId = localStorage.getItem('userId') + if (this.jobStatus == 31) { + this.showBtn = false + } else { + this.showBtn = true + } } else { this.showBtn = false this.datacontent.isClaims = false;