feat: 禅道321
This commit is contained in:
parent
0f0620e8db
commit
2f192f4107
|
|
@ -270,6 +270,10 @@ export default {
|
||||||
type: String,
|
type: String,
|
||||||
default: "",
|
default: "",
|
||||||
},
|
},
|
||||||
|
route:{
|
||||||
|
type: String,
|
||||||
|
default: "",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
scanDialog
|
scanDialog
|
||||||
|
|
@ -387,14 +391,14 @@ export default {
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
let that = this;
|
let that = this;
|
||||||
|
let arr = that.$route.path.split("/");
|
||||||
|
that.route_code = arr[2];
|
||||||
that.form.type = that.type;
|
that.form.type = that.type;
|
||||||
if(that.type==50){
|
if(that.type==50){
|
||||||
that.mtype=30;
|
that.mtype=30;
|
||||||
that.change_batch = true;
|
that.change_batch = true;
|
||||||
}
|
}
|
||||||
that.form.recive_mgroup = "";
|
that.form.recive_mgroup = "";
|
||||||
let arr = that.$route.path.split("/");
|
|
||||||
that.route_code = arr[2];
|
|
||||||
let materialObj = that.$TOOL.data.get("MATERIAL_OBJECT");
|
let materialObj = that.$TOOL.data.get("MATERIAL_OBJECT");
|
||||||
that.materialObj = materialObj;
|
that.materialObj = materialObj;
|
||||||
that.form.handle_date =that.form.send_date =this.$TOOL.dateFormat2(new Date());
|
that.form.handle_date =that.form.send_date =this.$TOOL.dateFormat2(new Date());
|
||||||
|
|
@ -409,10 +413,18 @@ export default {
|
||||||
that.form.material_changed_fname = that.wmItem.material_name;
|
that.form.material_changed_fname = that.wmItem.material_name;
|
||||||
}
|
}
|
||||||
that.$nextTick(()=>{
|
that.$nextTick(()=>{
|
||||||
console.log('that.type',that.type,'that.mtype',that.mtype)
|
|
||||||
if(that.type==20||that.type==50||(that.type==10&&that.mtype==30)||(that.mtype==30&&that.new_wm!=='')){
|
if(that.type==20||that.type==50||(that.type==10&&that.mtype==30)||(that.mtype==30&&that.new_wm!=='')){
|
||||||
that.form.recive_mgroup = that.mgroupId;
|
that.form.recive_mgroup = that.mgroupId;
|
||||||
}
|
}
|
||||||
|
if(that.route_code=='shangpaipingmo'&&that.mtype==30&&that.new_wm==''&&that.route!=''){
|
||||||
|
let date = new Date();
|
||||||
|
let year = date.getFullYear();
|
||||||
|
let month = date.getMonth()+1;
|
||||||
|
month = month>9?month:'0'+month;
|
||||||
|
let day = date.getDate();
|
||||||
|
day = day>9?day:'0'+day;
|
||||||
|
that.form.new_batch = 'HP'+year+month+day;
|
||||||
|
}
|
||||||
})
|
})
|
||||||
// type=10 正常交接 物料都可交接,接收工段有限制
|
// type=10 正常交接 物料都可交接,接收工段有限制
|
||||||
// type=20 返工交接 不合格品交接,接收工段为该工艺流程中的工段
|
// type=20 返工交接 不合格品交接,接收工段为该工艺流程中的工段
|
||||||
|
|
|
||||||
|
|
@ -258,6 +258,7 @@
|
||||||
<scrap-dialog
|
<scrap-dialog
|
||||||
v-if="dialog.scrap"
|
v-if="dialog.scrap"
|
||||||
ref="scrapDialog"
|
ref="scrapDialog"
|
||||||
|
:route="'in'"
|
||||||
:type="type"
|
:type="type"
|
||||||
:tag="tag"
|
:tag="tag"
|
||||||
:new_wm="new_wm"
|
:new_wm="new_wm"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue