From c47a1f5d473630a294174e76cd542ef816730290 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 16 Jun 2025 14:21:02 +0800 Subject: [PATCH] =?UTF-8?q?2025-06-16=20=E4=BB=8E=E6=AD=A4=E5=A4=84?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3BOM=E3=80=81Routing=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/part/bomManagement.vue | 29 +++++++++++-------- src/views/modules/part/recipeManagement.vue | 15 ++++++---- src/views/modules/part/routingManagement.vue | 9 ++++-- .../com_bm_bom.vue | 6 ++-- .../com_bm_routing.vue | 13 ++++----- 5 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index 3884b73..f500651 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -978,6 +978,7 @@ import { queryComponentPartBomList, // 查子物料BOM } from '@/api/part/bomManagement.js' import ChooseList from '@/views/modules/common/Chooselist' +import {isAuth} from "../../../utils"; export default { // 组件 @@ -2800,14 +2801,14 @@ export default { this.$nextTick(() => { this.height = window.innerHeight - 170 }) - const skipModal = localStorage.getItem('skipModal') === 'true' - const bomData = localStorage.getItem('bomData') - - if (bomData && !skipModal) { - this.modalFlag = true - } - - localStorage.removeItem('skipModal') + // const skipModal = localStorage.getItem('skipModal') === 'true' + // const bomData = localStorage.getItem('bomData') + // + // if (bomData && !skipModal) { + // this.modalFlag = true + // } + // + // localStorage.removeItem('skipModal') }, activated() { @@ -2992,17 +2993,21 @@ export default { this.$refs.selectDiv.setLengthAll( this.dataList.length) if (localStorage.getItem('bomData')) { let data = JSON.parse(localStorage.getItem('bomData')) - if(data.engChgLevel&&data.engChgLevel!==''&&data.engChgLevel!==null){ - this.updateModal(this.dataList[0]) - } + if (data.engChgLevel && data.engChgLevel !== '' && data.engChgLevel !== null && isAuth('104002001:update')) { + this.updateModal(this.dataList[0]) + } } + this.queryLoading = false + } else { + this.queryLoading = false } - this.queryLoading = false if (localStorage.getItem('bomData')) { this.$nextTick(function () { localStorage.removeItem('bomData') }) } + }).catch(()=>{ + this.queryLoading = false }) }, diff --git a/src/views/modules/part/recipeManagement.vue b/src/views/modules/part/recipeManagement.vue index 42f5726..61e438e 100644 --- a/src/views/modules/part/recipeManagement.vue +++ b/src/views/modules/part/recipeManagement.vue @@ -873,6 +873,7 @@ import { queryComponentPartRecipeList, // 查子物料配方 } from '@/api/part/recipeManagement.js' import ChooseList from '@/views/modules/common/Chooselist' +import {isAuth} from "../../../utils"; export default { // 组件 @@ -2944,7 +2945,7 @@ export default { // 获取数据列表 getDataList () { //如果是跳转过来的 要判断 - if (localStorage.getItem('recipeData') != undefined) { + if (localStorage.getItem('recipeData')) { let data = JSON.parse(localStorage.getItem('recipeData')) this.searchData.partNo = data.partNo this.searchData.ifsPartNo = data.ifsPartNo @@ -2961,19 +2962,23 @@ export default { this.pageSize = data.page.pageSize this.totalPage = data.page.totalCount this.$refs.selectDiv.setLengthAll( this.dataList.length) - if (localStorage.getItem('recipeData') != undefined) { + if (localStorage.getItem('recipeData')) { let data = JSON.parse(localStorage.getItem('recipeData')) - if(data.engChgLevel&&data.engChgLevel!==''&&data.engChgLevel!==null){ + if (data.engChgLevel && data.engChgLevel !== '' && data.engChgLevel !== null && isAuth('104002003:update')) { this.updateModal(this.dataList[0]) } } + this.queryLoading = false + } else { + this.queryLoading = false } - this.queryLoading = false - if (localStorage.getItem('recipeData') != undefined) { + if (localStorage.getItem('recipeData')) { this.$nextTick(function () { localStorage.removeItem('recipeData') }) } + }).catch(()=>{ + this.queryLoading = false }) }, diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index 9f94323..3534b52 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -1227,6 +1227,7 @@ import ChooseList from '@/views/modules/common/Chooselist' import {queryWorkCenterList} from "../../../api/part/workCenter"; import {queryWorkerLevelList} from "../../../api/base/laborClass"; import DictDataSelect from "../sys/dict-data-select-highlight.vue"; +import {isAuth} from "../../../utils"; export default { // 组件 @@ -3288,17 +3289,21 @@ export default { this.$refs.selectDiv.setLengthAll(this.dataList.length) if (localStorage.getItem('routeData')) { let data = JSON.parse(localStorage.getItem('routeData')) - if (data.routingRevision && data.routingRevision !== '' && data.routingRevision !== null) { + if (data.routingRevision && data.routingRevision !== '' && data.routingRevision !== null && isAuth('104003001:update')) { this.updateModal(this.dataList[0]) } } + this.queryLoading = false + } else { + this.queryLoading = false } - this.queryLoading = false if (localStorage.getItem('routeData')) { this.$nextTick(() => { localStorage.removeItem('routeData') }) } + }).catch(()=>{ + this.queryLoading = false }) }, diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue index 1e36631..03a6177 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue @@ -274,8 +274,7 @@ - + @@ -302,8 +301,7 @@ :label="item.columnLabel"> diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index 9f67727..ac7ad01 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -1676,18 +1676,17 @@ }) }, jumpRoute(){ - if(this.routeData.routingRevision!=null||this.routeData.routingRevision!==''){ + if (this.routeData.routingRevision != null || this.routeData.routingRevision !== '') { this.$message.error("route明细不存在") } - let inData={ - site:this.searchData.site, - partNo:this.routeData.partNo, - routingType:this.routeData.routingType, - routingRevision:this.routeData.routingRevision, + let inData = { + site: this.searchData.site, + partNo: this.routeData.partNo, + routingType: this.routeData.routingType, + routingRevision: this.routeData.routingRevision, } localStorage.setItem('routeData', JSON.stringify(inData)) window.open('#/part-routingManagement'); - }, // 获取流程的配置权限 getNodeAuthority (row) {