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

Show defect clearing for same-state merges

This commit is contained in:
caoqianming 2026-07-30 14:52:42 +08:00
parent c37eab7bbc
commit 25259fcecf
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@
></el-input>
<scScanner @scanResult="codeTextChange" v-if="project_code!=='bxerp'"></scScanner>
</el-form-item>
<el-form-item label="交接合计：">
<el-form-item label="合计：">
{{ totalCount }}
</el-form-item>
<el-form-item label="原始物料" v-if="mode!='add'&&form.mtype==20" style="margin-left: 20px;">
@ -75,7 +75,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="可交接数量">
<el-form-item label="可交接">
<span>{{ listItem.count_canhandover }}</span>
</el-form-item>
</el-col>
@ -477,19 +477,19 @@ export default {
if (items.length < 2) return false;
const states = new Set(items.map(i => Number(i.state)));
if (states.size !== 1) return false;
const tracking = Number(items[0].tracking);
if (tracking === 20) return true;
return items.every(i =>
Number(i.state) === 10 &&
i.defect != null &&
Number(i.defect_okcate) === 20
);
return true;
},
clearBatchDefectHint() {
const items = this.form.handoverb || [];
return Number(items[0] && items[0].tracking) === 20
const tracking = Number(
items[0] && (
items[0].tracking ??
(items[0].material_ && items[0].material_.tracking)
)
);
return tracking === 20
? "仅清除合批后批次的缺陷归类，单件缺陷记录保持不变"
: "将合格B类合并为无缺陷批次";
: "清除合批后批次的具体缺陷归类，库存状态保持不变";
}
},
watch: {

18
src/views/wpm_gx/handover_form.vue
View File

@ -487,19 +487,19 @@ export default {
if (items.length < 2) return false;
const states = new Set(items.map(i => Number(i.state)));
if (states.size !== 1) return false;
const tracking = Number(items[0].tracking);
if (tracking === 20) return true;
return items.every(i =>
Number(i.state) === 10 &&
i.defect != null &&
Number(i.defect_okcate) === 20
);
return true;
},
clearBatchDefectHint() {
const items = this.form.handoverb || [];
return Number(items[0] && items[0].tracking) === 20
const tracking = Number(
items[0] && (
items[0].tracking ??
(items[0].material_ && items[0].material_.tracking)
)
);
return tracking === 20
? "仅清除合批后批次的缺陷归类，单件缺陷记录保持不变"
: "将合格B类合并为无缺陷批次";
: "清除合批后批次的具体缺陷归类，库存状态保持不变";
}
},
watch: {