diff --git a/src/views/modules/lab/labRecord.vue b/src/views/modules/lab/labRecord.vue
index dfb07ed..a87f202 100644
--- a/src/views/modules/lab/labRecord.vue
+++ b/src/views/modules/lab/labRecord.vue
@@ -230,25 +230,7 @@
-
-
-
-
-
-
- 实验室审批人
- 实验室审批人
-
-
-
-
-
+
@@ -738,12 +720,6 @@
-
-
-
-
-
-
this.resolveTesterNameById(item)).join(';'))
+ const testerName = testerList.map(item => this.resolveTesterNameById(item)).join(';')
+ this.$set(this.modalData, 'testerName', testerName)
},
resolveLabApproverNameById (operatorId) {
const normalizedId = String(operatorId || '').trim()
@@ -1833,7 +1822,7 @@ export default {
})
},
loadTesterOptions () {
- if (!this.modalData || !this.modalData.site) {
+ if (!this.modalData || !this.modalData.site || !String(this.modalData.testLab || '').trim()) {
this.testerOptionList = []
this.testerDisplayList = []
this.testerSelectionCache = []
@@ -1841,7 +1830,7 @@ export default {
}
const params = {
site: this.modalData.site,
- roleNo: 'R025',
+ roleNo: String(this.modalData.testLab || '').trim(),
active: 'Y'
}
return searchUserListForRole(params).then(({data}) => {
@@ -1878,6 +1867,10 @@ export default {
this.$message.warning('请先选择工厂')
return
}
+ if (!String(this.modalData.testLab || '').trim()) {
+ this.$message.warning('请先选择Test Lab')
+ return
+ }
this.loadTesterOptions().then(() => {
if (!this.testerOptionList || this.testerOptionList.length === 0) {
this.$message.warning('未查询到可选测试人')
@@ -2477,7 +2470,6 @@ export default {
this.$set(this.modalData, 'testerName', this.modalData.testerName || this.modalData.tester || '')
this.$set(this.modalData, 'labApproverName', this.modalData.labApproverName || this.modalData.labApprover || '')
this.loadTesterOptions()
- this.loadLabApproverOptions()
this.loadModalButtonCondition()
this.loadNodeAuthority(this.modalData.site || row.site, this.modalData.stepId !== null && this.modalData.stepId !== undefined ? this.modalData.stepId : 10)
this.refreshJudgeCriteriaFileList()
@@ -2573,7 +2565,6 @@ export default {
return
}
this.syncTesterField()
- this.syncLabApproverField()
this.syncPropertyItemList()
const payload = this.buildLabPayload(this.modalData)
const submitMethod = this.modalTitle === 'Lab 新增' ? api.saveLab : api.updateLab
@@ -2629,7 +2620,6 @@ export default {
return
}
this.syncTesterField()
- this.syncLabApproverField()
this.syncPropertyItemList()
if (!this.nodeAuthorityLoaded) {
this.$message.warning('节点权限加载中,请稍后重试')