From 37a77e120d067ac512f9555fce9e2ae159d8c297 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Thu, 10 Jul 2025 15:06:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8=E5=AE=A2=E6=88=B7=E6=8F=90?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/repairTest/repair/dialogOneForm.vue | 69 +++++++++++-------- src/views/repairTest/repair/dialogTwoForm.vue | 25 ++++++- src/views/repairTest/repair/index.vue | 6 ++ src/views/repairTest/testExamine/index.vue | 6 ++ 4 files changed, 76 insertions(+), 30 deletions(-) diff --git a/src/views/repairTest/repair/dialogOneForm.vue b/src/views/repairTest/repair/dialogOneForm.vue index 592556c..bffa4e0 100644 --- a/src/views/repairTest/repair/dialogOneForm.vue +++ b/src/views/repairTest/repair/dialogOneForm.vue @@ -603,6 +603,8 @@ export default { taskId: '', isRequired: false, totalPrice: 0, // 总金额 + + currentUserId: '' //当前登录人 } }, mounted() { @@ -714,32 +716,36 @@ export default { }) }, init() { - console.log('this.rowObj', this.rowObj) - - getUserSelectApi({ roleIds: [133] }).then((response) => { - this.userSelectList = response.data; - if (this.rowObj.manageType == 0) { - this.dynamicValidateForm.premiumList = []; - this.dynamicValidateFormTwo.premiumListTwo = []; - this.addDomainOne(); - } else { - this.dynamicValidateForm.premiumList = []; - this.dynamicValidateFormTwo.premiumListTwo = []; - this.addDomainTwo(); - } - this.dynamicValidateForm.premiumList.forEach((item) => { - item.repairRemark = this.rowObj.repairRemark; - - }); - this.dynamicValidateFormTwo.premiumListTwo.forEach((item) => { - item.repairRemark = this.rowObj.repairRemark; - - }); - }); - getInfo().then((res) => { - this.companyId = res.user.companyId - }) - }, + console.log('this.rowObj', this.rowObj) + getInfo() + .then((res) => { + this.companyId = res.user.companyId + this.currentUserId = res.user.userId + // 返回 getUserSelectApi 的 Promise + return getUserSelectApi({ roleIds: [133] }) + }) + .then((response) => { + this.userSelectList = response.data + if (this.rowObj.manageType == 0) { + this.dynamicValidateForm.premiumList = [] + this.dynamicValidateFormTwo.premiumListTwo = [] + this.addDomainOne() + } else { + this.dynamicValidateForm.premiumList = [] + this.dynamicValidateFormTwo.premiumListTwo = [] + this.addDomainTwo() + } + this.dynamicValidateForm.premiumList.forEach((item) => { + item.repairRemark = this.rowObj.repairRemark + }) + this.dynamicValidateFormTwo.premiumListTwo.forEach((item) => { + item.repairRemark = this.rowObj.repairRemark + }) + }) + .catch((error) => { + console.error('初始化出错:', error) + }) + }, // 取消按钮 cancel() { this.dialogShowFlag = false @@ -754,7 +760,8 @@ export default { const day = String(date.getDate()).padStart(2, '0'); return `${year}-${month}-${day}`; }; - + // 检查 currentUserId 是否在 userSelectList 的 userId 中 + const isUserIdInList = this.userSelectList.some(user => user.userId === this.currentUserId); // 选择配件 partId // 是否收费 partType // 配件数量 partNum @@ -764,7 +771,7 @@ export default { const newDomain = { selected: 'N', // partId: '', - repairer: this.userSelectList.length > 0 ? this.userSelectList[0].userId : '', // 默认选择第一条数据 + repairer: this.userSelectList.length > 0 && isUserIdInList ? this.currentUserId : '', // 默认选择第一条数据 partType: 0, partNum: '', partCost: '', @@ -797,10 +804,14 @@ export default { const day = String(date.getDate()).padStart(2, '0'); return `${year}-${month}-${day}`; }; + + // 检查 currentUserId 是否在 userSelectList 的 userId 中 + const isUserIdInList = this.userSelectList.some(user => user.userId === this.currentUserId); + const newDomain = { selected: 'N', // partId: '', - repairer: this.userSelectList.length > 0 ? this.userSelectList[0].userId : '', // 默认选择第一条数据 + repairer: this.userSelectList.length > 0 && isUserIdInList ? this.currentUserId : '', // 默认选择第一条数据 partType: 0, partNum: '', partCost: '', diff --git a/src/views/repairTest/repair/dialogTwoForm.vue b/src/views/repairTest/repair/dialogTwoForm.vue index 3d7d9c4..41d188c 100644 --- a/src/views/repairTest/repair/dialogTwoForm.vue +++ b/src/views/repairTest/repair/dialogTwoForm.vue @@ -117,6 +117,17 @@ style="width: 350px" > + + +