fix:交接工序带入问题
This commit is contained in:
parent
a25e70c0a0
commit
29508b191a
|
|
@ -49,6 +49,7 @@
|
|||
>
|
||||
<span>{{ item.batch }}</span>
|
||||
<span v-if="item.material_&&item.material_.process_name">({{ item.material_.process_name }})</span>
|
||||
<span v-else>(原料棒)</span>
|
||||
|
||||
<div style="float: right">
|
||||
<span>{{ item.count }}</span>
|
||||
|
|
@ -65,7 +66,8 @@
|
|||
<el-col :span="10">
|
||||
<el-form-item label="交接物料">
|
||||
<!-- <sapn>{{ listItem.batch }}({{ listItem.process }})</sapn> -->
|
||||
<el-input :placeholder="listItem.batch+'('+listItem.process+')'" disabled></el-input>
|
||||
<el-input v-if="listItem.process" :placeholder="listItem.batch+'('+listItem.process+')'" disabled></el-input>
|
||||
<el-input v-else :placeholder="listItem.batch+'(原料棒)'" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
|
|
@ -573,7 +575,9 @@ export default {
|
|||
item.count = item.count_cando;
|
||||
totalCount += Number(item.count_cando);
|
||||
item.tracking = item.material_.tracking;
|
||||
item.process = item.material_.process_name;
|
||||
if(item.material_.process_name){
|
||||
item.process = item.material_.process_name;
|
||||
}
|
||||
item.handoverbw = [];
|
||||
that.getWprList(item.id,index);
|
||||
})
|
||||
|
|
@ -728,7 +732,9 @@ export default {
|
|||
let obj = {};
|
||||
obj.wm = item.id;
|
||||
obj.batch = item.batch;
|
||||
obj.batch = item.batch.material_.process_name;
|
||||
if(item.batch.material_.process_name){
|
||||
obj.process = item.batch.material_.process_name;
|
||||
}
|
||||
obj.count_cando = item.count;
|
||||
obj.count = item.count;
|
||||
obj.handoverbw = [];
|
||||
|
|
@ -780,7 +786,9 @@ export default {
|
|||
let obj2 = {};
|
||||
obj2.wm = arr[0].id;
|
||||
obj2.batch = arr[0].batch;
|
||||
obj2.process = arr[0].material_.process_name;
|
||||
if(arr[0].material_.process_name){
|
||||
obj2.process = arr[0].material_.process_name;
|
||||
}
|
||||
obj2.count_cando = arr[0].count;
|
||||
obj2.count = arr[0].count;
|
||||
if(that.form.handoverb&&that.form.handoverb.length>0){
|
||||
|
|
@ -839,7 +847,9 @@ export default {
|
|||
let obj2 = {};
|
||||
obj2.wm = item.id;
|
||||
obj2.batch = item.batch;
|
||||
obj2.process = item.material_.process_name;
|
||||
if(item.material_.process_name){
|
||||
obj2.process = item.material_.process_name;
|
||||
}
|
||||
obj2.count_cando = item.count;
|
||||
obj2.handoverbw = [];
|
||||
obj2.count = 1;
|
||||
|
|
|
|||
Loading…
Reference in New Issue