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

fix:禅道284

This commit is contained in:
shijing 2025-12-29 10:45:24 +08:00
parent 6a1c313bc1
commit d9daef3587
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,17 +8,17 @@
@closed="$emit('closed')" @closed="$emit('closed')"
> >
<el-container v-loading="loading"> <el-container v-loading="loading">
<el-main style="padding: 0 20px 20px 20px"> <el-main style="padding: 0">
<el-form <el-form
ref="dialogForm" ref="dialogForm"
:model="form" :model="form"
:rules="rules" :rules="rules"
label-position="right" label-position="right"
label-width="80px" label-width="80px"
style="padding: 0 10px" style="padding: 0"
> >
<el-row> <el-row>
<el-col v-if="!hasRoute&&!is_fix"> <el-col :md="12" :sm="12" :xs="24" v-if="!isfix&&!hasRoute">
<el-form-item label="工艺步骤" prop="route"> <el-form-item label="工艺步骤" prop="route">
<el-select <el-select
v-model="form.route" v-model="form.route"
@ -74,13 +74,15 @@
:label="item.batch" :label="item.batch"
:value="item.id" :value="item.id"
> >
<span>{{ item.batch }}</span>
<span v-if="item.defect_name&&item.defect_name!==null">({{ item.defect_name }})</span>
<span style="float: right;">{{ item.count_cando }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col> <el-col :md="12" :sm="12" :xs="24">
<el-form-item label="物料扫码" style="display: flex;"> <el-form-item label="物料扫码" style="display: flex;">
<!-- <scScanner @scanResult="formWminChange"></scScanner> -->
<el-input ref="codeInput" v-model="wm_in" clearable @change="formWminChange(wm_in)" style="width: 200px;margin-left: 4px;"></el-input> <el-input ref="codeInput" v-model="wm_in" clearable @change="formWminChange(wm_in)" style="width: 200px;margin-left: 4px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -221,14 +223,16 @@ export default {
this.params.mlog = this.mlog; this.params.mlog = this.mlog;
let arr = this.$route.path.split("/"); let arr = this.$route.path.split("/");
this.mgroup_code = arr[2]; this.mgroup_code = arr[2];
this.getMlogbIn(); this.$nextTick(()=>{
this.getMtask(); this.getMlogbIn();
this.getMaterial(); this.getMtask();
this.getParentList(); this.getMaterial();
this.getEquipment(); this.getParentList();
if(!this.hasRoute){ this.getEquipment();
this.getRoute(); if(!this.hasRoute&&!this.isfix){
} this.getRoute();
}
})
}, },
methods: { methods: {
open() { open() {
@ -307,7 +311,7 @@ export default {
obj.route =that.routeId; obj.route =that.routeId;
} }
obj.page =0; obj.page =0;
if(that.is_fix){//来料未完成的返修品&&出料已完成的返修品和不合格品 if(that.isfix ){//来料未完成的返修品&&出料已完成的返修品和不合格品
obj.tag = 'canfix'; obj.tag = 'canfix';
}else{ }else{
if(that.materialIn!==null&&that.materialIn!==''){ if(that.materialIn!==null&&that.materialIn!==''){

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

@ -3,12 +3,14 @@
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button <el-button
v-if="route_code!=='chengpingfanxiu'"
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="table_add2" @click="table_add2"
v-auth="'mlog.create'" v-auth="'mlog.create'"
>快速报工</el-button> >快速报工</el-button>
<el-button <el-button
v-if="route_code!=='chengpingfanxiu'"
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="table_add" @click="table_add"