Browse Source

1.取消点击到达 的人员限制

2.解决pqc任务只有标准值 结论自动带出bug
java8
赵宏斌 4 months ago
parent
commit
162f4a3fc7
  1. 4
      src/views/modules/qc/PQCResultEntry.vue
  2. 23
      src/views/modules/reportWorkOrder/reportDefectOrder.vue

4
src/views/modules/qc/PQCResultEntry.vue

@ -4276,6 +4276,10 @@ export default {
if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) { if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
return; return;
} }
if (row.numberValue==row.defaultValue){
row.itemResult = 'Y'
return
}
if (row.maxValue == null && row.minValue == null) { if (row.maxValue == null && row.minValue == null) {
if (row.numberValue!=row.defaultValue){ if (row.numberValue!=row.defaultValue){
row.itemResult = 'N' row.itemResult = 'N'

23
src/views/modules/reportWorkOrder/reportDefectOrder.vue

@ -598,7 +598,7 @@
<el-dialog title="到达" :close-on-click-modal="false" v-drag :visible.sync="chooseReachModelFlag" width="410px"> <el-dialog title="到达" :close-on-click-modal="false" v-drag :visible.sync="chooseReachModelFlag" width="410px">
<el-form :inline="true" label-position="top"> <el-form :inline="true" label-position="top">
<el-form-item > <el-form-item >
<span style="cursor: pointer" slot="label" @click="getOperatorList()"><a>选择到达人员</a></span>
<span style="cursor: pointer" slot="label" @click="getOperatorList(1)"><a>选择到达人员</a></span>
<el-input v-model="saveData.operatorName" style="width: 389px"></el-input> <el-input v-model="saveData.operatorName" style="width: 389px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -1979,10 +1979,15 @@
}, },
// //
getOperatorList () {
getOperatorList (param) {
this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
if (this.roleList.length > 0) { 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) { if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId this.operatorData.roleId = filterList[0].roleId
} else { } else {
@ -2302,12 +2307,12 @@
this.$message.warning('请选择到达人员!') this.$message.warning('请选择到达人员!')
return 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 = { let tempData = {
site: this.saveData.site, site: this.saveData.site,
buNo: this.saveData.buNo, buNo: this.saveData.buNo,

Loading…
Cancel
Save