From 4a9694c429f400574139e604cd401119cdab6f78 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 25 May 2023 13:57:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A5=A8=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=94=B9=E5=8A=A8=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=9D=83=E9=99=90=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scOpl/scFire.vue | 6 ++++-- src/directives/auth.js | 7 ++++--- src/directives/authsAll.js | 6 +++--- src/views/ecm/event_handlefrom.vue | 5 ++++- src/views/opm/opl.vue | 2 +- src/views/wf/ticketdetail.vue | 2 +- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/components/scOpl/scFire.vue b/src/components/scOpl/scFire.vue index 4766432f..5c30f329 100644 --- a/src/components/scOpl/scFire.vue +++ b/src/components/scOpl/scFire.vue @@ -294,12 +294,12 @@ mounted() { let that = this; that.oplId = that.id; //许可证ID - that.operationId = that.wfId; //zuoyeID + this.$nextTick(()=>{ that.getOplData(); that.getworkerList(); that.getgasList(); - that.getOperation(); + }) }, methods: { @@ -325,6 +325,8 @@ that.form = res; that.oplcateCode = res.cate_code; that.ticketId = res.ticket; + that.operationId = res.operation; //zuoyeID + that.getOperation(); res.create_imgs_.forEach(item=>{ console.log(item) that.create_imgs_list.push({ diff --git a/src/directives/auth.js b/src/directives/auth.js index 805ad4ce..14d1d72e 100644 --- a/src/directives/auth.js +++ b/src/directives/auth.js @@ -13,9 +13,10 @@ export default { return } let permissions = tool.data.get("PERMISSIONS"); - if (permissions.indexOf('superuser') > -1){ - return - } + + // if (permissions.indexOf('superuser') > -1){ + // return + // } if (!permissions.some((v) => v === binding.value)) el.parentNode.removeChild(el); } } diff --git a/src/directives/authsAll.js b/src/directives/authsAll.js index 2ca84c0b..883abb3c 100644 --- a/src/directives/authsAll.js +++ b/src/directives/authsAll.js @@ -13,9 +13,9 @@ export default { return } let permissions = tool.data.get("PERMISSIONS"); - if (permissions.indexOf('superuser') > -1){ - return - } + // if (permissions.indexOf('superuser') > -1){ + // return + // } const flag = judementSameArr(binding.value, permissions); if (!flag) el.parentNode.removeChild(el); } diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue index cd9bcb07..4fc3471d 100644 --- a/src/views/ecm/event_handlefrom.vue +++ b/src/views/ecm/event_handlefrom.vue @@ -41,7 +41,7 @@ {{ form.employee_.name }} - {{ form.operation_name }} + {{ form.operation_name }} {{ form.area_.name }} @@ -271,6 +271,9 @@ export default { return res; }); }, + oplClick(opl){ + this.$emit("oplDetail",opl); + }, }, }; diff --git a/src/views/opm/opl.vue b/src/views/opm/opl.vue index 80b7056a..b8b37e6d 100644 --- a/src/views/opm/opl.vue +++ b/src/views/opm/opl.vue @@ -87,7 +87,7 @@ - + diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue index 4b8bcdca..ffa72656 100644 --- a/src/views/wf/ticketdetail.vue +++ b/src/views/wf/ticketdetail.vue @@ -211,7 +211,7 @@ - +