diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue index 7781d83..6f05c65 100644 --- a/src/views/ysjl/3000/common/index.vue +++ b/src/views/ysjl/3000/common/index.vue @@ -127,12 +127,7 @@ - + @@ -1193,10 +1188,12 @@ export default { subArr.forEach((item) => { if (item.some((k) => k.jianyanjieguo.indexOf('×') === 0)) { this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = '不合格' - } else if (item.some((k) => k.jianyanjieguo.indexOf('√') === 0)) { + } else if (item.some((k) => k.jianyanjieguo.indexOf('√') === 0 || k.jianyanjieguo.indexOf('○') === 0)) { this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = '合格' } else if (item.every((k) => k.jianyanjieguo.indexOf('/') === 0)) { this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = '无此项' + } else { + this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = '' } }) const tableData = [] diff --git a/src/views/ysjl/3000/common/inspection-items.vue b/src/views/ysjl/3000/common/inspection-items.vue index 305ec4f..bf8ddb0 100644 --- a/src/views/ysjl/3000/common/inspection-items.vue +++ b/src/views/ysjl/3000/common/inspection-items.vue @@ -92,11 +92,9 @@ export default { if (val.indexOf('×') === 0) { jybgJyjgJyxm.jianyanjieguo = '不符合' + beizhu } else if (val.indexOf('√') === 0) { - let jyjg = '符合' - if (row.xiangmuleibie === 'C') { - jyjg = '资料确认符合' - } - jybgJyjgJyxm.jianyanjieguo = jyjg + beizhu + jybgJyjgJyxm.jianyanjieguo = '符合' + beizhu + } else if (val.indexOf('○') === 0) { + jybgJyjgJyxm.jianyanjieguo = '资料确认符合' + beizhu } else if (val.indexOf('/') === 0) { jybgJyjgJyxm.jianyanjieguo = '无此项' + beizhu } else {