Browse Source

发料任务添加Agv待库移

agv
李俊城 5 months ago
parent
commit
7cafa3cde7
  1. 13
      fe/PDA/common/basic.js
  2. 5
      fe/PDA/common/pdabasic.css
  3. 3
      fe/PDA/pages/task/assembleIssueJob.vue
  4. 12
      fe/PDA/pages/task/assembleIssueJobDetail.vue
  5. 12
      fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
  6. 2
      fe/PDA/pages/task/coatingIssuleJob.vue
  7. 12
      fe/PDA/pages/task/coatingIssuleJobDetail.vue
  8. 12
      fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
  9. 2
      fe/PDA/pages/task/injectionIssueJob.vue
  10. 13
      fe/PDA/pages/task/injectionIssueJobDetail.vue
  11. 12
      fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
  12. 2
      fe/PDA/pages/task/kittingIssueJob.vue
  13. 12
      fe/PDA/pages/task/kittingIssueJobDetail.vue
  14. 12
      fe/PDA/pages/task/kittingIssueJobDetailByQty.vue

13
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);
};

5
fe/PDA/common/pdabasic.css

@ -301,6 +301,11 @@
background-color: #ececec;
color: #666;
}
.agvWait {
background-color: #00B6FF ;
color: fff;
}
/* 检验任务状态 */
/* 免检 */

3
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() {

12
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;

12
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;

2
fe/PDA/pages/task/coatingIssuleJob.vue

@ -75,7 +75,7 @@
isToday: false,
titleArray: ['任务编号'],
loadingType: "nomore",
taps:["全部","待处理","待库移"],
taps:["全部","待AGV库移","待处理","待库移"],
current:0
};
},

12
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;

12
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;

2
fe/PDA/pages/task/injectionIssueJob.vue

@ -72,7 +72,7 @@
isToday: false,
titleArray: ['任务编号'],
loadingType: "nomore",
taps:["全部","待处理","待库移"],
taps:["全部","待AGV库移","待处理","待库移"],
current:0
};
},

13
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;

12
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;

2
fe/PDA/pages/task/kittingIssueJob.vue

@ -71,7 +71,7 @@
isToday: false,
titleArray: ['任务编号'],
loadingType: "nomore",
taps:["全部","待处理","待库移"],
taps:["全部","待AGV库移","待处理","待库移"],
current:0
};
},

12
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;

12
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;

Loading…
Cancel
Save