Always show defect clearing for merges
This commit is contained in:
parent
ddc324dd8e
commit
475b0eb4ed
|
|
@ -471,13 +471,7 @@ export default {
|
||||||
return this.form.handoverb.reduce((sum, item) => sum + Number(item.count || 0), 0);
|
return this.form.handoverb.reduce((sum, item) => sum + Number(item.count || 0), 0);
|
||||||
},
|
},
|
||||||
canClearBatchDefect() {
|
canClearBatchDefect() {
|
||||||
if (Number(this.mtype) !== 30) return false;
|
return Number(this.mtype) === 30 || this.change_batch;
|
||||||
if (this.new_wm) return false;
|
|
||||||
const items = this.form.handoverb || [];
|
|
||||||
if (items.length < 2) return false;
|
|
||||||
const states = new Set(items.map(i => Number(i.state)));
|
|
||||||
if (states.size !== 1) return false;
|
|
||||||
return true;
|
|
||||||
},
|
},
|
||||||
clearBatchDefectHint() {
|
clearBatchDefectHint() {
|
||||||
const items = this.form.handoverb || [];
|
const items = this.form.handoverb || [];
|
||||||
|
|
|
||||||
|
|
@ -482,12 +482,7 @@ export default {
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
canClearBatchDefect() {
|
canClearBatchDefect() {
|
||||||
if (Number(this.mtype) !== 30) return false;
|
return Number(this.mtype) === 30 || this.change_batch;
|
||||||
const items = this.form.handoverb || [];
|
|
||||||
if (items.length < 2) return false;
|
|
||||||
const states = new Set(items.map(i => Number(i.state)));
|
|
||||||
if (states.size !== 1) return false;
|
|
||||||
return true;
|
|
||||||
},
|
},
|
||||||
clearBatchDefectHint() {
|
clearBatchDefectHint() {
|
||||||
const items = this.form.handoverb || [];
|
const items = this.form.handoverb || [];
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue