feat:某批次物料加入wpr(改版)

This commit is contained in:
shijing 2025-11-19 15:30:22 +08:00
parent 42ff12d769
commit f6c24f3902
3 changed files with 49 additions and 5 deletions

View File

@ -257,6 +257,10 @@ export default {
type: String, type: String,
default: "done", default: "done",
}, },
wmItem: {
type: Object,
default: () => ({}),
},
}, },
components: { components: {
scanDialog scanDialog
@ -384,6 +388,11 @@ export default {
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());
that.form.send_mgroup = that.mgroupId; that.form.send_mgroup = that.mgroupId;
if(that.wmItem.wm){
that.form.new_batch = that.wmItem.batch;
that.form.material_changed = that.wmItem.material;
that.form.material_changed_fname = that.wmItem.material_name;
}
if(that.type==20||that.type==50){ if(that.type==20||that.type==50){
that.form.recive_mgroup = that.mgroupId; that.form.recive_mgroup = that.mgroupId;
} }

View File

@ -149,9 +149,9 @@
type="primary" type="primary"
style="margin-left: 10px;" style="margin-left: 10px;"
>检验</el-link> >检验</el-link>
<!-- <el-link :underline="false" type="primary" <el-link :underline="false" type="primary"
@click="handleWatch(scope.row)" @click="handleAddWpr(scope.row)"
>流程图</el-link> --> >添加物料</el-link>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>
@ -244,6 +244,7 @@
ref="scrapDialog" ref="scrapDialog"
:type="type" :type="type"
:tag="tag" :tag="tag"
:wmItem="wmItem"
:mgroupName="mgroup_name" :mgroupName="mgroup_name"
:mgroupId="mgroupId" :mgroupId="mgroupId"
@success="handleScrapSuccess" @success="handleScrapSuccess"
@ -377,6 +378,7 @@ export default {
search: "", search: "",
material: "", material: "",
}, },
wmItem:{},
wprParams:{ wprParams:{
page:0, page:0,
wm: "" wm: ""
@ -693,7 +695,22 @@ export default {
}) })
}, },
handleWprSuccess(row){} handleAddWpr(row){
this.dialog.scrap = true;
this.type = 50;
let obj = {};
obj.wm = row.id;
obj.batch = row.batch;
obj.mgroup = row.mgroup;
obj.material = row.material;
obj.mgroup_name = row.mgroup_name;
obj.material_name = row.material_name;
this.wmItem = obj;
this.$nextTick(() => {
this.$refs.scrapDialog.open("add");
});
},
handleWprSuccess(row){},
}, },
}; };
</script> </script>

View File

@ -233,7 +233,8 @@
width="120" width="120"
> >
<template #default="scope"> <template #default="scope">
<el-link :underline="false" @click="printMaterial(scope.row,'wpr')" type="primary">物料标签</el-link> <el-link :underline="false" @click="printMaterial(scope.row,'wpr')" type="primary">物料标签</el-link>
<el-link :underline="false" type="primary" @click="handleAddWpr(scope.row)">添加物料</el-link>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>
@ -258,6 +259,7 @@
v-if="dialog.scrap" v-if="dialog.scrap"
ref="scrapDialog" ref="scrapDialog"
:type="type" :type="type"
:wmItem="wmItem"
:mgroupName="mgroup_name" :mgroupName="mgroup_name"
:mgroupId="mgroupId" :mgroupId="mgroupId"
@success="handleScrapSuccess" @success="handleScrapSuccess"
@ -397,6 +399,7 @@ export default {
page:0, page:0,
wm: "" wm: ""
}, },
wmItem:{},
number_out_last:'', number_out_last:'',
route_code:"", route_code:"",
wmMaterial:'', wmMaterial:'',
@ -735,6 +738,21 @@ export default {
}) })
}, },
handleAddWpr(row){
this.dialog.scrap = true;
this.type = 50;
let obj = {};
obj.wm = row.id;
obj.batch = row.batch;
obj.mgroup = row.mgroup;
obj.material = row.material;
obj.mgroup_name = row.mgroup_name;
obj.material_name = row.material_name;
this.wmItem = obj;
this.$nextTick(() => {
this.$refs.scrapDialog.open("add");
});
},
}, },
}; };
</script> </script>