From eba271920539e87ca3f9ca560620b01df2f56ba0 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 6 Nov 2024 17:38:38 +0800 Subject: [PATCH 1/5] 2024-11-06 --- src/views/modules/part/partInformation.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index f5bffce..9b94241 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -17,6 +17,18 @@ + + + + + + + + + + + + Date: Wed, 6 Nov 2024 17:54:34 +0800 Subject: [PATCH 2/5] plm BMM --- .../com_projectInfo-add-or-update.vue | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue index 438c846..d264768 100644 --- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue +++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue @@ -68,16 +68,19 @@ - - 终端客户 - - - - - - + + + + + + + + + + + From b86c153163d8c4985eb451dd16850afb7aab1dff Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 6 Nov 2024 22:16:48 +0800 Subject: [PATCH 3/5] plm BMM --- .../technicalSpecificationDetail/com_tsd_basicInformation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index 5562993..43dc7fb 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -788,7 +788,7 @@ }).then(() => { let tempData = { site: this.searchData.site, - userName: this.searchData.username, + userName: this.$store.state.user.name, codeNo: this.searchData.codeNo, menuId: '103002' } From 2cbb996d15b173ef1b2de2b5310bd0f42d1d9849 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 6 Nov 2024 23:56:09 +0800 Subject: [PATCH 4/5] plm BMM --- .../technicalSpecificationDetail/com_bm_bom.vue | 3 +++ .../technicalSpecificationDetail/com_bm_routing.vue | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue index af07326..da07891 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue @@ -520,6 +520,9 @@ }) }, jumpBom(){ + if(this.bomData.engChgLevel!=null||this.bomData.engChgLevel!==''){ + this.$message.error("bom明细不存在") + } let inData={ site:this.searchData.site, partNo:this.bomData.partNo, diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index de285e9..9274484 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -1465,6 +1465,9 @@ }) }, jumpRoute(){ + if(this.routeData.routingRevision!=null||this.routeData.routingRevision!==''){ + this.$message.error("route明细不存在") + } let inData={ site:this.searchData.site, partNo:this.routeData.partNo, From adcf0c5da42c4ff997c68b9461380ea53d98a2e4 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 7 Nov 2024 10:53:53 +0800 Subject: [PATCH 5/5] 2024-11-06 --- src/views/modules/changeManagement/changeRecord.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index 50533e4..290615f 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -4158,7 +4158,7 @@ if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404') { this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',}) } else { - this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{codeNo:row.codeNo},}) + this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{nowCodeNo:row.codeNo},}) } },