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

fix:工段交接记录和库存修正

This commit is contained in:
shijing 2024-09-11 15:28:35 +08:00
parent 98b54e50d5
commit 744f78b621
2 changed files with 61 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/views/wpm_gx/handover.vue
View File

@ -75,21 +75,19 @@
<el-table-column type="expand"> <el-table-column type="expand">
<template #default="props"> <template #default="props">
<div style="padding-left: 50px"> <div style="padding-left: 50px">
<el-descriptions :column="2"> <template v-for="item in props.row.handoverb" :key="item.id">
<template v-for="item in props.row.handoverb" :key="item.id"> <el-descriptions :column="3">
<el-descriptions :column="3"> <el-descriptions-item label="批次">
<el-descriptions-item label="批次"> {{item.batch}}
{{props.row.batch}} </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item label="数量">
<el-descriptions-item label="数量"> {{item.count}}
{{props.row.count}} </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item label="不合格标记" v-if="item.notok_sign_name!==null">
<el-descriptions-item label="不合格标记" v-if="props.row.notok_sign_name!==null"> {{item.notok_sign_name}}
{{props.row.notok_sign_name}} </el-descriptions-item>
</el-descriptions-item> </el-descriptions>
</el-descriptions> </template>
</template>
</el-descriptions>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -105,18 +103,13 @@
</el-table-column> </el-table-column>
<el-table-column label="数量" prop="count" width="80"></el-table-column> <el-table-column label="数量" prop="count" width="80"></el-table-column>
<el-table-column label="交接类型" prop="type" width="100"> <el-table-column label="交接类型" prop="type" width="100">
<template #default="scope"> <template #default="scope" v-if="mgroupName=='size'||mgroupName=='facade'">
<el-text <el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text>
v-if="scope.row.send_mgroup == mgroupId" <el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text>
type="primary" </template>
>交送</el-text <template #default="scope" v-else>
> <el-text v-if="scope.row.send_mgroup == mgroupId" type="primary">交送</el-text>
<span style="width: 4px;"></span> <el-text v-if="scope.row.recive_mgroup == mgroupId" type="success">接收</el-text>
<el-text
v-if="scope.row.recive_mgroup == mgroupId"
type="success"
>接收</el-text
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="交接类别" prop="type" width="80"> <el-table-column label="交接类别" prop="type" width="80">
@ -127,9 +120,12 @@
<el-tag v-if="scope.row.type == 20" type="warning" <el-tag v-if="scope.row.type == 20" type="warning"
>返工</el-tag >返工</el-tag
> >
<el-tag v-if="scope.row.type == 30" type="warning" <el-tag v-if="scope.row.type == 30" type="primary"
>检验</el-tag >检验</el-tag
> >
<el-tag v-if="scope.row.type == 40" type="danger"
>报废</el-tag
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -275,8 +271,10 @@ export default {
selection: [], selection: [],
handoverItem: {}, handoverItem: {},
values: "交送", values: "交送",
deptId:'',
mtask: "", mtask: "",
mlogId: "", mlogId: "",
mgroupId: "",
processId: "", processId: "",
processCate: "", processCate: "",
printer_name: "", printer_name: "",
@ -285,12 +283,27 @@ export default {
}, },
mounted() { mounted() {
let that = this; let that = this;
console.log('that.mgroupName',that.mgroupName);
if(that.mgroupName=="size"){//尺寸检验 if(that.mgroupName=="size"){//尺寸检验
that.params.material__process__name="一次超洗"; // that.params.material__process__name="一次超洗";
that.apiObj = that.$API.wpm.handover.list; that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
if(res.length>0){
that.deptId = res[0].id;
that.params.dept=res[0].id;
console.log('that.deptId',that.deptId);
}
that.apiObj = that.$API.wpm.handover.list;
})
}else if(that.mgroupName=="facade"){//外观检验 }else if(that.mgroupName=="facade"){//外观检验
that.params.material__process__name="二次超洗"; // that.params.material__process__name="二次超洗";
that.apiObj = that.$API.wpm.handover.list; that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
if(res.length>0){
that.deptId = res[0].id;
that.params.dept=res[0].id;
console.log('that.deptId',that.deptId);
}
that.apiObj = that.$API.wpm.handover.list;
})
}else{//工段交接 }else{//工段交接
that.printer_name = localStorage.getItem("printer_name"); that.printer_name = localStorage.getItem("printer_name");
that.$API.mtm.mgroup.list that.$API.mtm.mgroup.list

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

@ -34,7 +34,6 @@
ref="table" ref="table"
:apiObj="apiObj" :apiObj="apiObj"
row-key="id" row-key="id"
hidePagination
:params="params" :params="params"
:query="query" :query="query"
> >
@ -182,6 +181,7 @@ export default {
apiObj: null, apiObj: null,
params: { params: {
mgroupx: "", mgroupx: "",
belong_dept:''
}, },
query: {}, query: {},
dialog: { dialog: {
@ -202,11 +202,21 @@ export default {
mounted() { mounted() {
let that = this; let that = this;
if(that.mgroupName=="size"){ if(that.mgroupName=="size"){
that.params.material__process__name = "一次超洗"; // that.params.material__process__name = "一次超洗";
that.apiObj = that.$API.wpm.wmaterial.list; that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
if(res.length>0){
that.params.belong_dept=res[0].id;
}
that.apiObj = that.$API.wpm.wmaterial.list;
})
}else if(that.mgroupName=="facade"){ }else if(that.mgroupName=="facade"){
that.params.material__process__name = "二次超洗"; // that.params.material__process__name = "二次超洗";
that.apiObj = that.$API.wpm.wmaterial.list; that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
if(res.length>0){
that.params.belong_dept=res[0].id;
}
that.apiObj = that.$API.wpm.wmaterial.list;
})
}else{ }else{
that.$API.mtm.mgroup.list that.$API.mtm.mgroup.list
.req({ page: 0, search: that.mgroupName }) .req({ page: 0, search: that.mgroupName })
@ -218,6 +228,7 @@ export default {
that.mgroupId = res[0].id; that.mgroupId = res[0].id;
that.$TOOL.data.set('gx_deptID',res[0].belong_dept) that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
that.params.mgroupx = res[0].id; that.params.mgroupx = res[0].id;
that.params.belong_dept = res[0].belong_dept;
that.apiObj = that.$API.wpm.wmaterial.list; that.apiObj = that.$API.wpm.wmaterial.list;
}); });
} }