From 64c944a3fc47e5c6d80859d6a0111bc090bee0d8 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Thu, 18 May 2023 20:46:32 +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

---
 .../permissionApplication/components/reportDrawer.vue |  2 +-
 src/views/permissionApplication/launch.vue            | 11 +++++++++--
 src/views/reportProcess/components/reportForm.vue     |  4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/permissionApplication/components/reportDrawer.vue b/src/views/permissionApplication/components/reportDrawer.vue
index 5880f71..a25198d 100644
--- a/src/views/permissionApplication/components/reportDrawer.vue
+++ b/src/views/permissionApplication/components/reportDrawer.vue
@@ -153,7 +153,7 @@ export default {
     },
     async open(form) {
       this.isShow = true
-      let oldPower = form.power
+      let oldPower = form.powerf?from.powerf:''
       if (!form.twoApprove) {
 
         form.twoApprove = ''
diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index 97ff70a..a13eb17 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -232,7 +232,7 @@ export default {
           this.$set(this.tableData[0],'oldpower',data.records[0].power)
         }else if(this.$route.query.isDraft){
           // 草稿的时候 判断当前的权限跟原来的下权限还是都一样
-            if(JSON.parse(this.processOld.dataJson).power==data.records[0].power){
+            if(JSON.parse(this.processOld.dataJson).power==data.records[0].power || JSON.parse(this.processOld.dataJson).power==''){
               this.tableData.push({...JSON.parse(this.processOld.dataJson),...JSON.parse(this.processOld.submitJson)})
             }else{
 
@@ -251,6 +251,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)
               if(res){
@@ -260,6 +261,7 @@ export default {
             }
             item.reportId = item['id']
             delete item['id']
+            item.power=''
             templateL.push(item)
           })
           this.tableData=templateL
@@ -290,8 +292,10 @@ export default {
     organizeData() {
       let newParams=[]
 
-      newParams=this.tableData.map(item=>{
+      let templ=JSON.parse(JSON.stringify(this.tableData))
+      newParams=templ.map(item=>{
         let obj={}
+
         obj={
           id:'',
           prcName:item.name,
@@ -311,6 +315,7 @@ export default {
           twoApproveName:item.twoApproveName,
           userId:this.userId,
         }
+        debugger
         delete item['oneApprove']
         delete item['oneApproveName']
         delete item['twoApprove']
@@ -327,11 +332,13 @@ export default {
     },
     // 保存
     handleSave(){
+      debugger
       this.saveLoading = true
       if(this.tableData.length==0){
         this.$message.warning('至少需要选择一条报告数据')
         return
       }
+
         // 处理表格数据
       this.organizeData()
       this.params=this.params.map(item=>{
diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue
index 7ee1bd5..b51ba57 100644
--- a/src/views/reportProcess/components/reportForm.vue
+++ b/src/views/reportProcess/components/reportForm.vue
@@ -28,8 +28,8 @@
         <el-col :span="10" :offset="2">
           <el-form-item label="标签:">
             <el-cascader :disabled="formControl"  v-model="form.labelList" :options="cascaderOptions"
-                         filterable collapse-tags
-                         :props="{ checkStrictly: true ,multiple: true }" clearable placeholder="请选择标签">
+
+                         :props="{  }" clearable placeholder="请选择标签">
               <template slot-scope="{ node, data }">
                 <span :title="data.label">{{ data.label }}</span>
               </template>