diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js index ac0a5b1..b2ff3f1 100644 --- a/src/api/eam/eam.js +++ b/src/api/eam/eam.js @@ -189,4 +189,10 @@ export const getSiteAndBuByUserName= data => createAPI(`/pms/eam/getSiteAndBuByU export const eamCheckRecordSearch= data => createAPI(`/pms/eam/eamCheckRecordSearch`,'post',data) export const eamDefectRecordSearch= data => createAPI(`/pms/eam/eamDefectRecordSearch`,'post',data) +/** + * 获取用户角色列表 + * @param data + * @returns {*} + */ +export const getUserRoleList= data => createAPI(`/pms/eam/getUserRoleList`,'post',data) diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue index 7202600..7e1e1bb 100644 --- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue +++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue @@ -160,7 +160,7 @@ - 协同人员 + 协同人员 协同人员 @@ -328,27 +328,27 @@ - +
- + + :value = "i.roleId"> - + - + - 查询 + 查询 { + if (data.code === 0) { + this.roleList = data.rows + } else { + this.roleList = [] + } + }) + }, + // 获取人员列表 getOperatorList () { - this.getRoleNameList() - this.operatorModelFlag = true this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo + if (this.roleList.length > 0) { + let filterList = this.roleList.filter(item => item.roleName === '机修人员') + if (filterList.length > 0) { + this.operatorData.roleId = filterList[0].roleId + } else { + this.operatorData.roleId = this.roleList[0].roleId + } + } else { + this.operatorData.roleId = '' + } // 先清空缓存选中 this.$nextTick(() => this.$refs.operatorTable.clearSelection()) // 拿到选中的人员编号 @@ -1511,6 +1533,7 @@ export default { this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true)) } }) + this.operatorModelFlag = true } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -1519,28 +1542,66 @@ export default { }) }, - // 获取数据列表 - getRoleNameList () { - this.dataListLoading = true - this.$http({ - url: this.$http.adornUrl('/sys/role/list2'), - method: 'get', - params: this.$http.adornParams({ - 'page': this.pageIndex, - 'limit': this.pageSize, - }) - }).then(({data}) => { + // 查询机修人员列表 + getOperatorList2 () { + getOperatorList(this.operatorData).then(({data}) => { if (data && data.code === 0) { - this.roleList = data.page.list - this.totalPage = data.page.totalCount + this.operatorList = data.rows } else { - this.roleList = [] - this.totalPage = 0 + this.operatorList = [] } - this.dataListLoading = false }) }, + // // 获取人员列表 + // getOperatorList () { + // this.getRoleNameList() + // this.operatorModelFlag = true + // this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo + // // 先清空缓存选中 + // this.$nextTick(() => this.$refs.operatorTable.clearSelection()) + // // 拿到选中的人员编号 + // let tempDataList = (this.saveData.adminID == null ? '' : this.saveData.adminID).split(';') + // // 查询所有部门 + // getOperatorList(this.operatorData).then(({data}) => { + // if (data && data.code === 0) { + // this.operatorList = data.rows + // this.operatorList.forEach(val => { + // // 回显选中的部门 + // if (tempDataList.includes(val.adminID)) { + // this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true)) + // } + // }) + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, + // + // // 获取数据列表 + // getRoleNameList () { + // this.dataListLoading = true + // this.$http({ + // url: this.$http.adornUrl('/sys/role/list2'), + // method: 'get', + // params: this.$http.adornParams({ + // 'page': this.pageIndex, + // 'limit': this.pageSize, + // }) + // }).then(({data}) => { + // if (data && data.code === 0) { + // this.roleList = data.page.list + // this.totalPage = data.page.totalCount + // } else { + // this.roleList = [] + // this.totalPage = 0 + // } + // this.dataListLoading = false + // }) + // }, + // 部门 operatorClickRow (row) { this.$refs.operatorTable.toggleRowSelection(row) @@ -1609,15 +1670,6 @@ export default { }) }, - closeDialog () { - this.operatorData = { - site: '', - adminName: '', - adminID: '', - roleName: '机修人员', - } - }, - // 动态列开始 获取 用户保存的 格式列 async getTableUserColumn (tableId, columnId) { let queryTableUser = { diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue index 9625646..8c13a70 100644 --- a/src/views/modules/eam/eamWorkPlanForCheck.vue +++ b/src/views/modules/eam/eamWorkPlanForCheck.vue @@ -216,11 +216,11 @@ - 计划执行人员 + 计划执行人员 - 选择审核人员 + 选择审核人员 @@ -370,11 +370,11 @@ - 计划执行人员 + 计划执行人员 - 选择审核人员 + 选择审核人员 @@ -386,7 +386,7 @@
----------------------------------------------------选择设备----------------------------------------------------
- 设备编辑 + 设备编辑 - +
- + + :value = "i.roleId"> - + - + - 查询 + 查询 - + + :value = "i.roleId"> - + - + - 查询 + 查询 0) { + let filterList = this.roleList.filter(item => item.roleName === '机修人员') + if (filterList.length > 0) { + this.operatorData.roleId = filterList[0].roleId + } else { + this.operatorData.roleId = this.roleList[0].roleId + } + } else { + this.operatorData.roleId = '' + } getOperatorList(this.operatorData).then(({data}) => { if (data && data.code === 0) { this.operatorList = data.rows this.modalData.operatorName = '' this.modalData.operator = '' - this.operatorModelFlag = true; + this.operatorModelFlag = true } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -1900,36 +1911,86 @@ }) }, - // 获取数据列表 - getRoleNameList () { - this.dataListLoading = true - this.$http({ - url: this.$http.adornUrl('/sys/role/list2'), - method: 'get', - params: this.$http.adornParams({ - 'page': this.pageIndex, - 'limit': this.pageSize, - }) - }).then(({data}) => { - let temp = [] + // 查询机修人员列表 + getOperatorList2 () { + getOperatorList(this.operatorData).then(({data}) => { if (data && data.code === 0) { - this.roleList = data.page.list - temp = this.roleList[0] - this.roleList[0] = this.roleList[1] - this.roleList[1] = temp - this.totalPage = data.page.totalCount + this.operatorList = data.rows + } else { + this.operatorList = [] + } + }) + }, + + // 获取用户角色 + getUserRoleList () { + getUserRoleList().then(({data}) => { + if (data.code === 0) { + this.roleList = data.rows } else { this.roleList = [] - this.totalPage = 0 } - this.dataListLoading = false }) }, + // // 获取机修人员列表 + // getOperatorList () { + // this.operatorData.bu = this.modalData.bu + // this.operatorData.site = this.$store.state.user.site + // this.getRoleNameList() + // getOperatorList(this.operatorData).then(({data}) => { + // if (data && data.code === 0) { + // this.operatorList = data.rows + // this.modalData.operatorName = '' + // this.modalData.operator = '' + // this.operatorModelFlag = true; + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, + // + // // 获取数据列表 + // getRoleNameList () { + // this.dataListLoading = true + // this.$http({ + // url: this.$http.adornUrl('/sys/role/list2'), + // method: 'get', + // params: this.$http.adornParams({ + // 'page': this.pageIndex, + // 'limit': this.pageSize, + // }) + // }).then(({data}) => { + // let temp = [] + // if (data && data.code === 0) { + // this.roleList = data.page.list + // temp = this.roleList[0] + // this.roleList[0] = this.roleList[1] + // this.roleList[1] = temp + // this.totalPage = data.page.totalCount + // } else { + // this.roleList = [] + // this.totalPage = 0 + // } + // this.dataListLoading = false + // }) + // }, + // 获取审核人员 getCheckerList () { this.checkerData.bu = this.modalData.bu - this.getRoleNameList() + if (this.roleList.length > 0) { + let filterList = this.roleList.filter(item => item.roleName === '机修人员') + if (filterList.length > 0) { + this.checkerData.roleId = filterList[0].roleId + } else { + this.checkerData.roleId = this.roleList[0].roleId + } + } else { + this.checkerData.roleId = '' + } getCheckerList(this.checkerData).then(({data}) => { if (data && data.code === 0) { this.checkerList = data.rows @@ -1944,6 +2005,35 @@ }) }, + // 查询机修人员列表 + getCheckerList2 () { + getCheckerList(this.checkerData).then(({data}) => { + if (data && data.code === 0) { + this.checkerList = data.rows + } else { + this.checkerList = [] + } + }) + }, + + // // 获取审核人员 + // getCheckerList () { + // this.checkerData.bu = this.modalData.bu + // this.getRoleNameList() + // getCheckerList(this.checkerData).then(({data}) => { + // if (data && data.code === 0) { + // this.checkerList = data.rows + // this.modalData.checkerName = '' + // this.modalData.checker = '' + // this.checkerModelFlag = true + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, + // 多选 selectionChangeHandle2 (val) { this.dataListSelections2 = val diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue index 509c7e4..831a047 100644 --- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue +++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue @@ -578,23 +578,23 @@
- + + :value = "i.roleId"> - + - + - 查询 + 查询 - + + :value = "i.roleId"> - + - + - 查询 + 查询 0) { + let filterList = this.roleList.filter(item => item.roleName === '机修人员') + if (filterList.length > 0) { + this.operatorData.roleId = filterList[0].roleId + } else { + this.operatorData.roleId = this.roleList[0].roleId + } + } else { + this.operatorData.roleId = '' + } getOperatorList(this.operatorData).then(({data}) => { if (data && data.code === 0) { this.operatorList = data.rows @@ -1788,36 +1799,105 @@ }) }, - // 获取数据列表 - getRoleNameList () { - this.dataListLoading = true - this.$http({ - url: this.$http.adornUrl('/sys/role/list2'), - method: 'get', - params: this.$http.adornParams({ - 'page': this.pageIndex, - 'limit': this.pageSize, - }) - }).then(({data}) => { - let temp = [] + // 查询机修人员列表 + getOperatorList2 () { + getOperatorList(this.operatorData).then(({data}) => { if (data && data.code === 0) { - this.roleList = data.page.list - temp = this.roleList[0] - this.roleList[0] = this.roleList[1] - this.roleList[1] = temp - this.totalPage = data.page.totalCount + this.operatorList = data.rows + } else { + this.operatorList = [] + } + }) + }, + + + // 获取用户角色 + getUserRoleList () { + getUserRoleList().then(({data}) => { + if (data.code === 0) { + this.roleList = data.rows } else { this.roleList = [] - this.totalPage = 0 } - this.dataListLoading = false }) }, + // // 获取机修人员列表 + // getOperatorList () { + // this.operatorData.bu = this.modalData.bu + // this.operatorData.site = this.$store.state.user.site + // this.getRoleNameList() + // getOperatorList(this.operatorData).then(({data}) => { + // if (data && data.code === 0) { + // this.operatorList = data.rows + // this.modalData.operatorName = '' + // this.modalData.operator = '' + // this.operatorModelFlag = true + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, + // + // // 获取数据列表 + // getRoleNameList () { + // this.dataListLoading = true + // this.$http({ + // url: this.$http.adornUrl('/sys/role/list2'), + // method: 'get', + // params: this.$http.adornParams({ + // 'page': this.pageIndex, + // 'limit': this.pageSize, + // }) + // }).then(({data}) => { + // let temp = [] + // if (data && data.code === 0) { + // this.roleList = data.page.list + // temp = this.roleList[0] + // this.roleList[0] = this.roleList[1] + // this.roleList[1] = temp + // this.totalPage = data.page.totalCount + // } else { + // this.roleList = [] + // this.totalPage = 0 + // } + // this.dataListLoading = false + // }) + // }, + + // // 获取审核人员 + // getCheckerList () { + // this.checkerData.bu = this.modalData.bu + // this.getRoleNameList() + // getCheckerList(this.checkerData).then(({data}) => { + // if (data && data.code === 0) { + // this.checkerList = data.rows + // this.modalData.checkerName = '' + // this.modalData.checker = '' + // this.checkerModelFlag = true + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, + // 获取审核人员 getCheckerList () { this.checkerData.bu = this.modalData.bu - this.getRoleNameList() + if (this.roleList.length > 0) { + let filterList = this.roleList.filter(item => item.roleName === '审核人员') + if (filterList.length > 0) { + this.checkerData.roleId = filterList[0].roleId + } else { + this.checkerData.roleId = this.roleList[0].roleId + } + } else { + this.checkerData.roleId = '' + } getCheckerList(this.checkerData).then(({data}) => { if (data && data.code === 0) { this.checkerList = data.rows @@ -1832,6 +1912,17 @@ }) }, + // 查询机修人员列表 + getCheckerList2 () { + getCheckerList(this.checkerData).then(({data}) => { + if (data && data.code === 0) { + this.checkerList = data.rows + } else { + this.checkerList = [] + } + }) + }, + selectFlag () { return true }, diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue index 02b70bc..a7ddedd 100644 --- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue +++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue @@ -385,12 +385,6 @@ handler: function (newV, oldV) { this.saveData.workTime = Math.ceil(Math.floor(this.dayjs(this.saveData.endDate2).diff(this.saveData.startDate2, 'seconds') / 30) / 2) } - }, - searchData: { - deep: true, - handler: function (newV, oldV) { - this.searchData.groupID = this.searchData.groupID.toUpperCase() - } } }, data () { @@ -1352,11 +1346,11 @@ this.$message.warning(this.detailList[i].itemDesc+'实测值未填写！') return } - if (this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue !== '' && this.detailList[i].numberValue != null) { - if((this.detailList[i].minValue !== "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)){ - this.detailList[i].itemResult = '不合格' - } - } + // if (this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue !== '' && this.detailList[i].numberValue != null) { + // if((this.detailList[i].minValue !== "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)){ + // this.detailList[i].itemResult = '不合格' + // } + // } } if (this.saveData.checkResult === '不合格') { this.detailList.forEach(val => { diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index e68ba86..34639e8 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -265,16 +265,16 @@ - +
- + + :value = "i.roleId"> @@ -285,7 +285,7 @@ - 查询 + 查询 { + if (data.code === 0) { + this.roleList = data.rows + } else { + this.roleList = [] + } + }) + }, + // 获取机修人员列表 getOperatorList () { this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo - this.operatorData.site = this.$store.state.user.site - this.getRoleNameList() - if (this.saveData.operator == null) { - this.saveData.operator = '' - this.saveData.operatorName = '' + if (this.roleList.length > 0) { + let filterList = this.roleList.filter(item => item.roleName === '机修人员') + if (filterList.length > 0) { + this.operatorData.roleId = filterList[0].roleId + } else { + this.operatorData.roleId = this.roleList[0].roleId + } + } else { + this.operatorData.roleId = '' } // 先清空缓存选中 this.$nextTick(() => this.$refs.operatorTable.clearSelection()) // 拿到选中的人员编号 - let tempDataList = this.saveData.operator.split(';') + let tempDataList = (this.saveData.operator == null ? '' : this.saveData.operator).split(';') // 查询人员 getOperatorList(this.operatorData).then(({data}) => { if (data && data.code === 0) { @@ -1135,34 +1152,84 @@ }) } }) + if (this.saveData.operator == null) { + this.saveData.operator = '' + this.saveData.operatorName = '' + } }, - // 获取数据列表 - getRoleNameList () { - this.dataListLoading = true - this.$http({ - url: this.$http.adornUrl('/sys/role/list2'), - method: 'get', - params: this.$http.adornParams({ - 'page': this.pageIndex, - 'limit': this.pageSize, - }) - }).then(({data}) => { - let temp = [] + // 查询机修人员列表 + getOperatorList2 () { + // // 先清空缓存选中 + // this.$nextTick(() => this.$refs.operatorTable.clearSelection()) + // 查询人员 + getOperatorList(this.operatorData).then(({data}) => { if (data && data.code === 0) { - this.roleList = data.page.list - temp = this.roleList[0] - this.roleList[0] = this.roleList[1] - this.roleList[1] = temp - this.totalPage = data.page.totalCount + this.operatorList = data.rows } else { - this.roleList = [] - this.totalPage = 0 + this.operatorList = [] } - this.dataListLoading = false }) }, + // // 获取机修人员列表 + // getOperatorList () { + // this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo + // this.operatorData.site = this.$store.state.user.site + // this.getRoleNameList() + // if (this.saveData.operator == null) { + // this.saveData.operator = '' + // this.saveData.operatorName = '' + // } + // // 先清空缓存选中 + // this.$nextTick(() => this.$refs.operatorTable.clearSelection()) + // // 拿到选中的人员编号 + // let tempDataList = this.saveData.operator.split(';') + // // 查询人员 + // getOperatorList(this.operatorData).then(({data}) => { + // if (data && data.code === 0) { + // this.operatorList = data.rows + // this.operatorList.forEach(val => { + // // 回显选中的人员 + // if (tempDataList.includes(val.adminID)) { + // this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true)) + // } + // }) + // this.operatorModelFlag = true + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, + // + // // 获取数据列表 + // getRoleNameList () { + // this.dataListLoading = true + // this.$http({ + // url: this.$http.adornUrl('/sys/role/list2'), + // method: 'get', + // params: this.$http.adornParams({ + // 'page': this.pageIndex, + // 'limit': this.pageSize, + // }) + // }).then(({data}) => { + // let temp = [] + // if (data && data.code === 0) { + // this.roleList = data.page.list + // temp = this.roleList[0] + // this.roleList[0] = this.roleList[1] + // this.roleList[1] = temp + // this.totalPage = data.page.totalCount + // } else { + // this.roleList = [] + // this.totalPage = 0 + // } + // this.dataListLoading = false + // }) + // }, + // 多选 selectionChangeHandle2 (val) { this.dataListSelections2 = val @@ -1534,15 +1601,6 @@ document.activeElement.blur() }, - closeDialog () { - this.operatorData = { - site: '', - adminName: '', - adminID: '', - roleName: '机修人员', - } - }, - // 动态列开始 获取 用户保存的 格式列 async getTableUserColumn (tableId, columnId) { let queryTableUser = { diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue index 582f3c1..bba97b8 100644 --- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue +++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue @@ -101,8 +101,8 @@ fixed="right" label="操作"> @@ -354,27 +354,27 @@ - +
- + + :value = "i.roleId"> - + - + - 查询 + 查询 { + if (data.code === 0) { + this.roleList = data.rows + } else { + this.roleList = [] + } + }) + }, + // 获取机修人员列表 getOperatorList () { this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo - this.getRoleNameList() + if (this.roleList.length > 0) { + let filterList = this.roleList.filter(item => item.roleName === '机修人员') + if (filterList.length > 0) { + this.operatorData.roleId = filterList[0].roleId + } else { + this.operatorData.roleId = this.roleList[0].roleId + } + } else { + this.operatorData.roleId = '' + } getOperatorList(this.operatorData).then(({data}) => { if (data && data.code === 0) { this.operatorList = data.rows @@ -1359,24 +1382,53 @@ }) }, - // 获取数据列表 - getRoleNameList () { - this.$http({ - url: this.$http.adornUrl('/sys/role/list2'), - method: 'get', - params: this.$http.adornParams({ - 'page': this.pageIndex, - 'limit': this.pageSize, - }) - }).then(({data}) => { + // 查询机修人员列表 + getOperatorList2 () { + getOperatorList(this.operatorData).then(({data}) => { if (data && data.code === 0) { - this.roleList = data.page.list + this.operatorList = data.rows } else { - this.roleList = [] + this.operatorList = [] } }) }, + // // 获取机修人员列表 + // getOperatorList () { + // this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo + // this.getRoleNameList() + // getOperatorList(this.operatorData).then(({data}) => { + // if (data && data.code === 0) { + // this.operatorList = data.rows + // this.saveData.operatorName = '' + // this.saveData.operator = '' + // this.operatorModelFlag = true + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, + // + // // 获取数据列表 + // getRoleNameList () { + // this.$http({ + // url: this.$http.adornUrl('/sys/role/list2'), + // method: 'get', + // params: this.$http.adornParams({ + // 'page': this.pageIndex, + // 'limit': this.pageSize, + // }) + // }).then(({data}) => { + // if (data && data.code === 0) { + // this.roleList = data.page.list + // } else { + // this.roleList = [] + // } + // }) + // }, + // 点击行选中复选框 operatorClickRow (row) { @@ -1668,11 +1720,11 @@ this.$message.warning(this.detailList[i].itemDesc+'实测值未填写！') return } - if (this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue !== '' && this.detailList[i].numberValue != null) { - if ((this.detailList[i].minValue !== "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue !== ""&& this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)) { - this.detailList[i].itemResult = '不合格' - } - } + // if (this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue !== '' && this.detailList[i].numberValue != null) { + // if ((this.detailList[i].minValue !== "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue !== ""&& this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)) { + // this.detailList[i].itemResult = '不合格' + // } + // } } if (this.saveData.checkResult === '不合格') { this.detailList.forEach(val => { @@ -1728,15 +1780,6 @@ document.activeElement.blur() }, - closeDialog () { - this.operatorData = { - site: '', - adminName: '', - adminID: '', - roleName: '机修人员', - } - }, - // 动态列开始 获取 用户保存的 格式列 async getTableUserColumn (tableId, columnId) { let queryTableUser = {