diff --git a/src/views/modules/yieldReport/com_defect_roll.vue b/src/views/modules/yieldReport/com_defect_roll.vue index 39595f4..04aeede 100644 --- a/src/views/modules/yieldReport/com_defect_roll.vue +++ b/src/views/modules/yieldReport/com_defect_roll.vue @@ -528,10 +528,12 @@ export default { this.tagNo = val this.$nextTick(() => { let strVal = ""; + let conSql = ""; if (val === 89){ strVal = this.pageData.defectCode; + conSql = " and A.workCenter_no = '" + this.scheduleData.workCenterNo + "'" } - this.$refs.baseList.init(val, strVal) + this.$refs.baseList.init(val, strVal, conSql) }) }, diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue index 7a1038a..3e95625 100644 --- a/src/views/modules/yieldReport/com_separate_roll.vue +++ b/src/views/modules/yieldReport/com_separate_roll.vue @@ -1007,10 +1007,12 @@ export default { this.tagNo = val this.$nextTick(() => { let strVal = '' + let conSql = '' if (val === 89) { strVal = this.rollDefectForm.defectCode || '' + conSql = " and A.workCenter_no = '" + this.scheduleData.workCenterNo + "'" } - this.$refs.baseList.init(val, strVal) + this.$refs.baseList.init(val, strVal, conSql) }) },