diff --git a/src/views/modules/qc/PQCResultEntry.vue b/src/views/modules/qc/PQCResultEntry.vue index fc672d4..0dda441 100644 --- a/src/views/modules/qc/PQCResultEntry.vue +++ b/src/views/modules/qc/PQCResultEntry.vue @@ -4276,6 +4276,10 @@ export default { if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) { return; } + if (row.numberValue==row.defaultValue){ + row.itemResult = 'Y' + return + } if (row.maxValue == null && row.minValue == null) { if (row.numberValue!=row.defaultValue){ row.itemResult = 'N' diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index 909a8c9..ba91373 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -598,7 +598,7 @@ - 选择到达人员 + 选择到达人员 @@ -1979,10 +1979,15 @@ }, // 获取机修人员列表 - getOperatorList () { + getOperatorList (param) { this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo if (this.roleList.length > 0) { - let filterList = this.roleList.filter(item => item.roleName === '机修人员') + let filterList + if (param === 1) { + filterList = this.roleList.filter(item => item.roleName === '换线组') + } else { + filterList = this.roleList.filter(item => item.roleName === '机修人员') + } if (filterList.length > 0) { this.operatorData.roleId = filterList[0].roleId } else { @@ -2302,12 +2307,12 @@ this.$message.warning('请选择到达人员!') return } - if (this.buNo != '01-Label' && this.planPeople){ - if (!this.saveData.operatorName.includes(this.planPeople)){ - this.$message.warning('到达人员中不包含计划人员!') - return - } - } + // if (this.buNo != '01-Label' && this.planPeople){ + // if (!this.saveData.operatorName.includes(this.planPeople)){ + // this.$message.warning('到达人员中不包含计划人员!') + // return + // } + // } let tempData = { site: this.saveData.site, buNo: this.saveData.buNo,