fix:光芯生产执行中无聊选择时展示缺陷标志
This commit is contained in:
parent
5e88ca8045
commit
76e143450e
|
@ -52,12 +52,8 @@
|
|||
>
|
||||
<span>{{ item.batch }}</span>
|
||||
<span>({{ item.material_name }})</span>
|
||||
<div style="float: right">
|
||||
<span>{{ item.count }}</span>
|
||||
<span v-if="item.notok_sign_name !== null" style="color: #aaaaaa">
|
||||
({{ item.notok_sign_name }})
|
||||
</span>
|
||||
</div>
|
||||
<span v-if="item.defect_name !== null" style="color: orangered">{{ item.defect_name }}</span>
|
||||
<span style="float: right">{{ item.count }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<el-dialog
|
||||
:title="titleMap[form.type]"
|
||||
v-model="visible"
|
||||
:size="1000"
|
||||
style="width: 80%;"
|
||||
destroy-on-close
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
|
@ -40,11 +40,12 @@
|
|||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料批次" v-else>
|
||||
<el-form-item label="批次选择" v-else>
|
||||
<el-select
|
||||
v-model="selectBatch"
|
||||
filterable
|
||||
value-key="id"
|
||||
style="width: 100%;"
|
||||
@change="selectwmChange"
|
||||
>
|
||||
<el-option
|
||||
|
@ -54,6 +55,7 @@
|
|||
:value="item.id"
|
||||
>
|
||||
<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
|
||||
style="
|
||||
float: right;
|
||||
|
@ -64,6 +66,8 @@
|
|||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="批次扫描" v-if="cate == 'do_in'">
|
||||
<scScanner @scanResult="codeTextChange"></scScanner>
|
||||
<el-input
|
||||
ref="codeInput"
|
||||
|
|
|
@ -38,7 +38,10 @@
|
|||
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>
|
||||
</div>
|
||||
</el-option>
|
||||
|
|
Loading…
Reference in New Issue