diff --git a/src/pages/quality/BpCheck/index.vue b/src/pages/quality/BpCheck/index.vue index d16cf8f..7f16bff 100644 --- a/src/pages/quality/BpCheck/index.vue +++ b/src/pages/quality/BpCheck/index.vue @@ -25,7 +25,7 @@ - + 请选择不良项 {{form.badNum}} diff --git a/src/pages/quality/SampleCheck/index.vue b/src/pages/quality/SampleCheck/index.vue index 415c83d..7c9b71e 100644 --- a/src/pages/quality/SampleCheck/index.vue +++ b/src/pages/quality/SampleCheck/index.vue @@ -12,6 +12,12 @@ + + + + + + @@ -191,7 +197,9 @@ export default class SampleCheck extends BasePage { secondDate: undefined, thirdDate: undefined, searchFlag:"1", - workOrderCodeSap:undefined + workOrderCodeSap:undefined, + incomeBatchNo:undefined, + materialName:undefined }; total = 0; list: any = []; @@ -234,6 +242,7 @@ export default class SampleCheck extends BasePage { resultsOption =[ { key:"合格", value: "Y" }, { key:"不合格", value: "N" }, + { key:"未复检", value: "X" }, ] yesOrNotOption = [ @@ -299,7 +308,11 @@ export default class SampleCheck extends BasePage { if (item.resultList) { for (const i of item.resultList){ if (i.checkTimes === num){ - return false + if (i.qualified === 'X'){ + return true + }else { + return false + } } } } @@ -336,7 +349,11 @@ export default class SampleCheck extends BasePage { for (const i of item.resultList){ if (i.checkTimes === num){ - return moment(i.createTime).format('YYYY-MM-DD HH:mm:ss'); + let str = '' + if (i.qualified === 'X'){ + str = '(未复检)' + } + return moment(i.createTime).format('YYYY-MM-DD HH:mm:ss') + str; } }