diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue index a1729a8..a06a58d 100644 --- a/src/views/modules/eam/eamFeedBack.vue +++ b/src/views/modules/eam/eamFeedBack.vue @@ -1217,7 +1217,6 @@ // 获取数据列表 this.getDataList() } - this.getClassesList() // 获取用户角色 this.getUserRoleList() }, @@ -1563,7 +1562,12 @@ this.saveFeedMatterFlag = true }, getClassesList() { - getClassesList().then(({data}) => { + let split = this.saveModalData.bu.split('_') + let params = { + site: split[0], + buNo: split[1] + } + getClassesList(params).then(({data}) => { if (data.code === 0) { this.classesList = data.rows } else { @@ -1852,6 +1856,8 @@ } else { this.operatorData.roleId = '' } + //根据bu查询班次信息 + this.getClassesList() // 查询人员 getOperatorListByOrder(this.operatorData).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index 1268caa..9ac750a 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -450,7 +450,7 @@ min-width="80" label="实测值"> @@ -3825,6 +3825,34 @@ this.$refs[aaa].focus() }) }, + updateItemResult(row){ + if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) { + return; + } + if (row.maxValue == null && row.minValue == null) { + if (row.numberValue!=row.defaultValue){ + row.itemResult = 'N' + } + }else if (row.maxValue != null && row.minValue != null){ + if (row.numberValue>row.maxValue ||row.numberValuerow.maxValue) { + row.itemResult = 'N' + }else { + row.itemResult = 'Y' + } + }else if(row.minValue != null){ + if ( row.numberValue @@ -3799,6 +3799,35 @@ this.$refs[aaa].focus() }) }, + updateItemResult(row){ + if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) { + this.$message.success("tuichu") + return; + } + if (row.maxValue == null && row.minValue == null) { + if (row.numberValue!=row.defaultValue){ + row.itemResult = 'N' + } + }else if (row.maxValue != null && row.minValue != null){ + if (row.numberValue>row.maxValue ||row.numberValuerow.maxValue) { + row.itemResult = 'N' + }else { + row.itemResult = 'Y' + } + }else if(row.minValue != null){ + if ( row.numberValue @@ -3879,6 +3879,34 @@ this.$refs[aaa].focus() }) }, + updateItemResult(row){ + if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) { + return; + } + if (row.maxValue == null && row.minValue == null) { + if (row.numberValue!=row.defaultValue){ + row.itemResult = 'N' + } + }else if (row.maxValue != null && row.minValue != null){ + if (row.numberValue>row.maxValue ||row.numberValuerow.maxValue) { + row.itemResult = 'N' + }else { + row.itemResult = 'Y' + } + }else if(row.minValue != null){ + if ( row.numberValue @@ -2867,6 +2867,34 @@ this.$refs[aaa].focus() }) }, + updateItemResult(row){ + if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) { + return; + } + if (row.maxValue == null && row.minValue == null) { + if (row.numberValue!=row.defaultValue){ + row.itemResult = 'N' + } + }else if (row.maxValue != null && row.minValue != null){ + if (row.numberValue>row.maxValue ||row.numberValuerow.maxValue) { + row.itemResult = 'N' + }else { + row.itemResult = 'Y' + } + }else if(row.minValue != null){ + if ( row.numberValue @@ -4140,6 +4140,34 @@ export default { this.$refs[aaa].focus() }) }, + updateItemResult(row){ + if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) { + return; + } + if (row.maxValue == null && row.minValue == null) { + if (row.numberValue!=row.defaultValue){ + row.itemResult = 'N' + } + }else if (row.maxValue != null && row.minValue != null){ + if (row.numberValue>row.maxValue ||row.numberValuerow.maxValue) { + row.itemResult = 'N' + }else { + row.itemResult = 'Y' + } + }else if(row.minValue != null){ + if ( row.numberValue