fix:光芯生产执行中无聊选择时展示缺陷标志

This commit is contained in:
shijing 2025-04-28 08:58:35 +08:00
parent 5e88ca8045
commit 76e143450e
3 changed files with 12 additions and 9 deletions

View File

@ -52,12 +52,8 @@
> >
<span>{{ item.batch }}</span> <span>{{ item.batch }}</span>
<span>({{ item.material_name }})</span> <span>({{ item.material_name }})</span>
<div style="float: right"> <span v-if="item.defect_name !== null" style="color: orangered">{{ item.defect_name }}</span>
<span>{{ item.count }}</span> <span style="float: right">{{ item.count }}</span>
<span v-if="item.notok_sign_name !== null" style="color: #aaaaaa">
({{ item.notok_sign_name }})
</span>
</div>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

View File

@ -2,7 +2,7 @@
<el-dialog <el-dialog
:title="titleMap[form.type]" :title="titleMap[form.type]"
v-model="visible" v-model="visible"
:size="1000" style="width: 80%;"
destroy-on-close destroy-on-close
@closed="$emit('closed')" @closed="$emit('closed')"
> >
@ -40,11 +40,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="物料批次" v-else> <el-form-item label="批次选择" v-else>
<el-select <el-select
v-model="selectBatch" v-model="selectBatch"
filterable filterable
value-key="id" value-key="id"
style="width: 100%;"
@change="selectwmChange" @change="selectwmChange"
> >
<el-option <el-option
@ -54,6 +55,7 @@
:value="item.id" :value="item.id"
> >
<span style="display:inline-block;float: left;">{{item.material_.name}}|{{ item.batch }}</span> <span style="display:inline-block;float: left;">{{item.material_.name}}|{{ item.batch }}</span>
<span v-if="item.defect_name!==null" style="display:inline-block;float: left;color: orangered;">{{ item.defect_name }}</span>
<span <span
style=" style="
float: right; float: right;
@ -64,6 +66,8 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item>
<el-form-item label="批次扫描" v-if="cate == 'do_in'">
<scScanner @scanResult="codeTextChange"></scScanner> <scScanner @scanResult="codeTextChange"></scScanner>
<el-input <el-input
ref="codeInput" ref="codeInput"

View File

@ -38,7 +38,10 @@
justify-content: space-between; justify-content: space-between;
" "
> >
<span>{{ item.batch }}({{ item.material_name }})</span> <div>
<span>{{ item.batch }}({{ item.material_name }})</span>
<span v-if="item.defect_name !== null" style="color: orangered">{{ item.defect_name }}</span>
</div>
<span>{{ item.count }}</span> <span>{{ item.count }}</span>
</div> </div>
</el-option> </el-option>