From 1b2a2ee2beb9016fc9f9009cacddbfe188eb61fd Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Thu, 18 May 2023 21:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/reportDrawer.vue               | 19 ++++++++++++-------
 src/views/permissionApplication/launch.vue    |  6 ++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/permissionApplication/components/reportDrawer.vue b/src/views/permissionApplication/components/reportDrawer.vue
index 03c3983..9c46bb9 100644
--- a/src/views/permissionApplication/components/reportDrawer.vue
+++ b/src/views/permissionApplication/components/reportDrawer.vue
@@ -153,7 +153,14 @@ export default {
     },
     async open(form) {
       this.isShow = true
+
+      this.PERMISSION.forEach(item=>{
+        if(item.value ==  item.power ){
+          form.powerName=item.label
+        }
+      })
       let oldPower = form.powerf?form.powerf:''
+
       if (!form.twoApprove) {
 
         form.twoApprove = ''
@@ -161,11 +168,10 @@ export default {
 
         form.applyReason = ''
         form.prcType = ''
-        form.powerName=''
-        form.power=''
+        // form.power=''
         this.conTwo=false
         this.PERMISSION = this.PERMISSION.map(item=>{
-          if(item.value == oldPower){
+          if(item.value == oldPower ){
             item.disabled=true
           }else{
             item.disabled=false
@@ -183,8 +189,7 @@ export default {
           if(form.powerName == ''||  !form.powerName){
             form.applyReason = ''
             form.prcType = ''
-            form.powerName=''
-            form.power=''
+            // form.power=''
           }
           // 是不是有以前的数据
           if(form.oldpower){
@@ -213,8 +218,8 @@ export default {
           }else{
             form.applyReason = ''
             form.prcType = ''
-            form.powerName=''
-            form.power=''
+            // form.powerName=''
+            // form.power=''
           }
         }
 
diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index 0496dcb..759c3d2 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -244,6 +244,7 @@ export default {
               })
               this.tableData.push({...JSON.parse(this.processOld.dataJson),...JSON.parse(this.processOld.submitJson),powerName:powerName})
               this.tableData[0].oldpower=data.records[0].power
+              this.tableData[0].powerf=data.records[0].power
               this.$set(this.tableData[0],'oldpower',data.records[0].power)
             }
         }else{
@@ -251,6 +252,7 @@ export default {
           data.records.map(async item => {
             item.oneApprove = item.createUserId || ''
             item.oneApproveName= item.uploader || ''
+
             item.powerf= item.power
             if(item.oneApprove){
               let res=await this.getLearder(item.oneApprove)
@@ -262,11 +264,11 @@ export default {
             item.reportId = item['id']
             delete item['id']
             item.power='2'
+            item.powerName="预览+下载"
             templateL.push(item)
           })
           this.tableData=templateL
-          console.log("页面没渲染？",this.tableData)
-
+          this.$set(this,'tableData',templateL)
         }
     })