fix:交接记录扫码后批次交接详情列表全部展示
This commit is contained in:
parent
0c7ce37ed8
commit
853048a473
|
@ -555,11 +555,10 @@ export default {
|
||||||
//获取接收工段人员
|
//获取接收工段人员
|
||||||
getUserList2() {
|
getUserList2() {
|
||||||
let that = this;
|
let that = this;
|
||||||
let deptID = '';
|
|
||||||
this.mgroupOptions.forEach(item => {
|
this.mgroupOptions.forEach(item => {
|
||||||
if(item.id==that.form.recive_mgroup){
|
if(item.id==that.form.recive_mgroup){
|
||||||
deptID = item.belong_dept;
|
let deptID = item.belong_dept;
|
||||||
this.$API.system.user.list.req({ depts: deptID, page: 0 }).then((res) => {
|
this.$API.system.user.list.req({ belong_dept: deptID, page: 0 }).then((res) => {
|
||||||
that.userList2 = res;
|
that.userList2 = res;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -707,17 +706,14 @@ export default {
|
||||||
}
|
}
|
||||||
let that = this;
|
let that = this;
|
||||||
if(data.indexOf('#')>-1){
|
if(data.indexOf('#')>-1){
|
||||||
// let keys = data.split('#')[0];
|
|
||||||
let id = data.split('#')[1];
|
let id = data.split('#')[1];
|
||||||
this.$API.cm.labelmat.item.req(id).then((res) => {
|
this.$API.cm.labelmat.item.req(id).then((res) => {
|
||||||
let arr = that.form.handoverb.filter((item) => {
|
let arr = that.form.handoverb.filter((item) => {
|
||||||
return item.batch == res.batch&&item.state==res.state;
|
return item.batch == res.batch&&item.state==res.state;
|
||||||
})
|
})
|
||||||
// console.log('arr',arr)
|
|
||||||
if(arr.length>0){
|
if(arr.length>0){
|
||||||
that.$message.error("该批次已存在")
|
that.$message.error("该批次已存在")
|
||||||
}else{
|
}else{
|
||||||
// console.log('materialOptions',that.materialOptions)
|
|
||||||
that.materialOptions.forEach((item) => {
|
that.materialOptions.forEach((item) => {
|
||||||
if(item.batch == res.batch){
|
if(item.batch == res.batch){
|
||||||
let params = {material: item.material,type: that.type};
|
let params = {material: item.material,type: that.type};
|
||||||
|
@ -730,9 +726,9 @@ export default {
|
||||||
obj.count_cando = item.count;
|
obj.count_cando = item.count;
|
||||||
obj.count = item.count;
|
obj.count = item.count;
|
||||||
obj.handoverbw = [];
|
obj.handoverbw = [];
|
||||||
that.$API.wpm.wpr.list.req({wm:item.id}).then((res) => {
|
that.$API.wpm.wpr.list.req({wm:item.id,page:0}).then((res) => {
|
||||||
let handoverbw = [];
|
let handoverbw = [];
|
||||||
let list = res.results;
|
let list = res;
|
||||||
list.forEach(item1=>{
|
list.forEach(item1=>{
|
||||||
let obj1 = {};
|
let obj1 = {};
|
||||||
obj1.wpr = item1.id;
|
obj1.wpr = item1.id;
|
||||||
|
|
Loading…
Reference in New Issue