diff --git a/src/views/modules/lab/labRecord.vue b/src/views/modules/lab/labRecord.vue index d47628b..bc9a25b 100644 --- a/src/views/modules/lab/labRecord.vue +++ b/src/views/modules/lab/labRecord.vue @@ -2964,6 +2964,12 @@ export default { this.$message.warning('没有下达权限') return } + const currentUserName = String((this.$store.state.user && this.$store.state.user.name) || '').trim() + const creator = String((row && (row.createBy || row.applicant)) || '').trim() + if (!currentUserName || currentUserName !== creator) { + this.$message.error('只能下达自己发起的申请!') + return + } this.$confirm('确认下达该申请单?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/modules/test/testSoRouting/testRoutingTable.vue b/src/views/modules/test/testSoRouting/testRoutingTable.vue index 8f207dd..4f78204 100644 --- a/src/views/modules/test/testSoRouting/testRoutingTable.vue +++ b/src/views/modules/test/testSoRouting/testRoutingTable.vue @@ -682,6 +682,34 @@ export default { this.workCenter.workCenterNo = val this.searchWorkCenter(true) }, + workCenterBlur() { + const workCenterNo = String(this.testSoRouting.workCenterNo || '').trim() + if (!workCenterNo) { + this.testSoRouting.workCenterDesc = '' + this.testSoRouting.workCenterType = '' + return + } + this.testSoRouting.workCenterNo = workCenterNo + searchWorkCenter({ + site: this.testSoRouting.site || this.$store.state.user.site, + workCenterNo: workCenterNo + }).then(({data}) => { + const list = (data && data.data) || [] + const matched = list.find(item => String(item.workCenterNo || '').trim().toLowerCase() === workCenterNo.toLowerCase()) + if (data && (data.code === 200 || data.code === 0) && matched) { + this.testSoRouting.workCenterNo = matched.workCenterNo + this.testSoRouting.workCenterDesc = matched.workCenterDesc + this.testSoRouting.workCenterType = matched.workCenterType + return + } + this.testSoRouting.workCenterDesc = '' + this.testSoRouting.workCenterType = '' + this.$message.warning('加工中心不存在') + }).catch(() => { + this.testSoRouting.workCenterDesc = '' + this.testSoRouting.workCenterType = '' + }) + }, openWorkCenterDialog(){ this.workCenter.workCenterNo = this.testSoRouting.workCenterNo; this.searchWorkCenter() @@ -765,7 +793,7 @@ export default { 加工中心 - +