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

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
zty 2025-01-13 11:30:40 +08:00
parent b63b5c12db 2a5183defd
commit b31ae9403c
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/wpm_bx/handover_form.vue
View File

@ -144,6 +144,8 @@
:value="item.id" :value="item.id"
> >
<span>{{ item.batch }}</span> <span>{{ item.batch }}</span>
<span v-if="item.material_">({{ item.material_.process_name }})</span>
<div style="float: right"> <div style="float: right">
<span>{{ item.count }}</span> <span>{{ item.count }}</span>
<span v-if="item.notok_sign_name !== null" style="color: #aaaaaa"> <span v-if="item.notok_sign_name !== null" style="color: #aaaaaa">

6
src/views/wpm_bx/inm.vue
View File

@ -86,7 +86,8 @@
min-width="80" min-width="80"
> >
<template #default="scope"> <template #default="scope">
<el-link :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link> <span v-if="scope.row.material_&&scope.row.material_.tracking==10">{{scope.row.count}}</span>
<el-link v-else :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -111,9 +112,8 @@
> >
<template #default="scope"> <template #default="scope">
<el-link :underline="false" @click="printMaterial(scope.row)" type="primary">物料标签</el-link> <el-link :underline="false" @click="printMaterial(scope.row)" type="primary">物料标签</el-link>
<!-- <el-link
v-if="scope.row.material_&&scope.row.material_.tracking==10" -->
<el-link <el-link
v-if="scope.row.material_&&scope.row.material_.tracking==10"
:underline="false" :underline="false"
@click="inmCheck(scope.row)" @click="inmCheck(scope.row)"
type="primary" type="primary"

5
src/views/wpm_bx/mlogb_form.vue
View File

@ -156,6 +156,8 @@ export default {
return item.parent==null; return item.parent==null;
}) })
that.form.parent = that.mlogbInOptions[0].id; that.form.parent = that.mlogbInOptions[0].id;
}else{
that.form.parent = '';
} }
}) })
}, },
@ -209,7 +211,8 @@ export default {
that.form.batch = ''; that.form.batch = '';
that.form.parent = ''; that.form.parent = '';
that.form.count_use = 0; that.form.count_use = 0;
that.getParentList(); that.$emit("closed");
that.visible = false;
}).catch((err) => {}); }).catch((err) => {});
}, },
//设置过滤项 //设置过滤项