zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:光芯车间库存去掉检验

This commit is contained in:
shijing 2025-03-14 10:21:56 +08:00
parent bfca9d02bd
commit 65e5a9ac4b
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/views/wpm_gx/inm.vue
View File

@ -2,8 +2,10 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'">领料</el-button> <el-button type="primary" v-auth="'mio.do'" @click="tomio('do_out')">领料</el-button>
<el-button type="primary" @click="batchConcat()">合批</el-button> <el-button type="primary" v-auth="'handover.create'" @click="table_add(20)">返修</el-button>
<el-button type="primary" v-auth="'handover.create'" @click="table_add(40)">报废</el-button>
<el-button type="primary" v-auth="'handover.create'" @click="batchConcat()">合批</el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-select <el-select
@ -102,10 +104,10 @@
label="操作" label="操作"
fixed="right" fixed="right"
align="center" align="center"
width="120" width="100"
> >
<template #default="scope"> <template #default="scope">
<el-button <!-- <el-button
link size="small" link size="small"
@click="table_Check(scope.row)" @click="table_Check(scope.row)"
v-auth="'ftestwork.create'" v-auth="'ftestwork.create'"
@ -119,7 +121,7 @@
@click="tableCheckList(scope.row)" @click="tableCheckList(scope.row)"
v-if="scope.row.defect_name == null" v-if="scope.row.defect_name == null"
>检验记录 >检验记录
</el-button> </el-button> -->
<el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button> <el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -133,7 +135,8 @@
@choseChange="choseChange" @choseChange="choseChange"
></materials> ></materials>
</el-dialog> </el-dialog>
<check-dialog <!-- 检验 -->
<!-- <check-dialog
v-if="dialog.save" v-if="dialog.save"
ref="saveDialog" ref="saveDialog"
:mgroup="mgroupId" :mgroup="mgroupId"
@ -142,7 +145,8 @@
@success="handleSaveSuccess" @success="handleSaveSuccess"
@closed="dialog.save = false" @closed="dialog.save = false"
> >
</check-dialog> </check-dialog> -->
<!-- 返修/报废 -->
<scrap-dialog <scrap-dialog
v-if="dialog.scrap" v-if="dialog.scrap"
ref="scrapDialog" ref="scrapDialog"
@ -161,6 +165,7 @@
@closed="visibleDrawer = false" @closed="visibleDrawer = false"
> >
</showDrawer> </showDrawer>
<!-- 领料 -->
<save-dialog <save-dialog
v-if="dialog.inmRecord" v-if="dialog.inmRecord"
ref="inmRecordDialog" ref="inmRecordDialog"
@ -279,7 +284,7 @@ export default {
that.params.tag="todo"; that.params.tag="todo";
that.$TOOL.data.set('gx_deptID',that.deptId) that.$TOOL.data.set('gx_deptID',that.deptId)
that.apiObj = that.$API.wpm.wmaterial.list; that.apiObj = that.$API.wpm.wmaterial.list;
this.getMgroupInfo(); // this.getMgroupInfo();
}, },
methods: { methods: {
getMgroupInfo(){ getMgroupInfo(){
@ -301,15 +306,10 @@ export default {
that.$refs.table.refresh(); that.$refs.table.refresh();
}); });
}, },
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
});
},
selectionChange(selection) { selectionChange(selection) {
let that = this; let that = this;
that.selection = selection; that.selection = selection;
//合批
if(selection.length>0){ if(selection.length>0){
let material = selection[0].material; let material = selection[0].material;
selection.forEach((item)=>{ selection.forEach((item)=>{
@ -320,6 +320,7 @@ export default {
}) })
} }
}, },
//分批
rowClick(val){ rowClick(val){
this.dialog.handover = true; this.dialog.handover = true;
this.type = 10; this.type = 10;
@ -327,15 +328,8 @@ export default {
this.$refs.handoverDialog.open("add",val,20); this.$refs.handoverDialog.open("add",val,20);
}); });
}, },
//合批
batchConcat(){ batchConcat(){
// let that = this;
// let obj = {};
// obj.type = 10;
// obj.mtype = 30;
// obj.handle_date = obj.send_date = that.$TOOL.dateFormat2(new Date());
// obj.send_mgroup = obj.recive_mgroup = that.mgroupId;
// let userInfo = that.$TOOL.data.get("USER_INFO");
// obj.send_user = obj.recive_user= userInfo.id;
this.changebatch = true; this.changebatch = true;
let handoverb = []; let handoverb = [];
if(this.selection.length>0){ if(this.selection.length>0){
@ -363,6 +357,7 @@ export default {
this.$refs.table_wm.queryData(this.queryWm); this.$refs.table_wm.queryData(this.queryWm);
this.materialsVisible = false; this.materialsVisible = false;
}, },
//领料
tomio(type) { tomio(type) {
let that = this; let that = this;
that.cate_type=type; that.cate_type=type;
@ -387,12 +382,23 @@ export default {
this.$refs.showDrawer.open(); this.$refs.showDrawer.open();
}); });
}, },
//添加报废 //添加返修/报废
table_add(type) { table_add(type) {
this.dialog.scrap = true; this.dialog.scrap = true;
this.type = type; this.type = type;
let handoverb = [];
if(this.selection.length>0){
this.selection.forEach(item=>{
let obj = {};
obj.wm = item.id;
obj.batch = item.batch;
obj.count_cando = item.count_cando;
obj.count = item.count_cando;
handoverb.push(obj)
})
}
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.scrapDialog.open("add"); this.$refs.scrapDialog.open("add",handoverb,10);
}); });
}, },
handleScrapSuccess(){ handleScrapSuccess(){

21
src/views/wpm_gx/inmOut.vue
View File

@ -2,13 +2,10 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'" <el-button type="primary" v-auth="'mio.do'" @click="tomio('do_in')">入库</el-button>
>入库</el-button> <el-button type="primary" v-auth="'handover.create'" @click="table_add(20)">返修</el-button>
<el-button type="primary" v-auth="'handover.create'" @click="table_add(20)"> <el-button type="primary" v-auth="'handover.create'" @click="table_add(40)">报废</el-button>
返修</el-button> <el-button type="primary" v-auth="'handover.create'" @click="batchConcat()">合批</el-button>
<el-button type="primary" v-auth="'handover.create'" @click="table_add(40)">
报废</el-button>
<el-button type="primary" @click="batchConcat()">合批</el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-select <el-select
@ -107,10 +104,10 @@
label="操作" label="操作"
fixed="right" fixed="right"
align="center" align="center"
width="120" width="100"
> >
<template #default="scope"> <template #default="scope">
<el-button <!-- <el-button
link size="small" link size="small"
@click="table_Check(scope.row)" @click="table_Check(scope.row)"
v-auth="'ftestwork.create'" v-auth="'ftestwork.create'"
@ -118,14 +115,13 @@
v-if="scope.row.defect_name == null" v-if="scope.row.defect_name == null"
>检验 >检验
</el-button> </el-button>
<!-- v-if="mgroupName!=='size'&&mgroupName!=='facade'&&scope.row.defect_name == null" -->
<el-button <el-button
link size="small" link size="small"
type="warning" type="warning"
@click="tableCheckList(scope.row)" @click="tableCheckList(scope.row)"
v-if="scope.row.defect_name == null" v-if="scope.row.defect_name == null"
>检验记录 >检验记录
</el-button> </el-button> -->
<el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button> <el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -344,7 +340,7 @@ export default {
}) })
} }
}, },
//添加报废 //添加返修/报废
table_add(type) { table_add(type) {
this.dialog.scrap = true; this.dialog.scrap = true;
this.type = type; this.type = type;
@ -382,6 +378,7 @@ export default {
this.$refs.scrapDialog.open("add",handoverb,30); this.$refs.scrapDialog.open("add",handoverb,30);
}); });
}, },
//报废后刷新页面
handleScrapSuccess(){ handleScrapSuccess(){
this.dialog.scrap = false; this.dialog.scrap = false;
this.$refs.table.refresh(); this.$refs.table.refresh();