From 62120b8640e92cbde4ba2d034757c3d3c633b742 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Thu, 11 May 2023 16:20:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportList.vue                      |  4 ++--
 src/views/permissionApplication/examine.vue          | 11 +++++++----
 src/views/reportProcess/examine.vue                  | 10 +++++++---
 src/views/userCenter/processCenter/finishProcess.vue |  1 +
 src/views/userCenter/processCenter/gencyProcess.vue  |  1 +
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue
index ec74688..8283b86 100644
--- a/src/views/Report/ReportList.vue
+++ b/src/views/Report/ReportList.vue
@@ -93,10 +93,10 @@
             </vxe-column>
             <vxe-column show-overflow show-header-overflow field="mainContent" title="摘要"></vxe-column>
             <vxe-column show-overflow show-header-overflow field="year" title="报告年份"></vxe-column>
-            <vxe-column show-overflow show-header-overflow field="rating" title="报告评级">
+            <vxe-column show-overflow show-header-overflow field="reportRating" title="报告评级">
               <template #default="{row}">
                 <el-rate
-                  v-model="row.rating/2"
+                  v-model="row.reportRating/2"
                   disabled
                   text-color="#ff9900"
                  >
diff --git a/src/views/permissionApplication/examine.vue b/src/views/permissionApplication/examine.vue
index eeb8601..4503fd2 100644
--- a/src/views/permissionApplication/examine.vue
+++ b/src/views/permissionApplication/examine.vue
@@ -141,7 +141,8 @@ export default {
         pageNo: 1
       },
       submitjson:{},
-      prcType:1
+      prcType:'',
+      application:'' //存储转办的意见
     }
   },
   created () {
@@ -149,7 +150,7 @@ export default {
     this.prcNum=this.$store.getters.handleProcess.prcNum
     this.prcId=this.$store.getters.handleProcess.prcId
     this.prcName=this.$store.getters.handleProcess.prcName
-    this.$set(this.processForm,'prcName',this.prcName)
+    this.prcType=this.$store.getters.handleProcess.prcType
     let params={
       prcId: this.prcId,
       prcType: this.prcType
@@ -191,8 +192,9 @@ export default {
       })
     },
     // 转办
-    handleTransfer() {
+    handleTransfer(type) {
       this.visibleTree = true
+      this.application=type
     },
     // 选择转办
     handleDblClick(treeNode) {
@@ -205,7 +207,8 @@ export default {
                 taskId: this.taskId,
                 assignee: treeNode[0].USID,
                 userId: this.$store.getters.userInfo.usid,
-                pId: this.prcId
+                pId: this.prcId,
+                approvalOpinion:this.application
               }).then(() => {
                 this.$message.success('转办成功')
                 this.$router.push({path: '/userCenter/processCenter', query: {id: this.$route.query.id}})
diff --git a/src/views/reportProcess/examine.vue b/src/views/reportProcess/examine.vue
index cc8e61b..75f2cb7 100644
--- a/src/views/reportProcess/examine.vue
+++ b/src/views/reportProcess/examine.vue
@@ -89,7 +89,9 @@ export default {
       },
       PERMISSION,
       submitjson:{},
-      prcType: ''
+      prcType: '',
+      application:'' //存储转办的意见
+
     }
   },
   created () {
@@ -123,8 +125,9 @@ export default {
   },
   methods: {
     // 转办
-    handleTransfer() {
+    handleTransfer(type) {
       this.visibleTree = true
+      this.application = type
     },
     // 选择转办
     handleDblClick(treeNode) {
@@ -137,7 +140,8 @@ export default {
               taskId: this.taskId,
               assignee: treeNode[0].USID,
               userId: this.$store.getters.userInfo.usid,
-              pId: this.prcId
+              pId: this.prcId,
+              approvalOpinion:this.application
             }).then(() => {
               this.$message.success('转办成功')
               this.$router.push({path: '/userCenter/processCenter', query: {id: this.$route.query.id}})
diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue
index 20604ac..db532e9 100644
--- a/src/views/userCenter/processCenter/finishProcess.vue
+++ b/src/views/userCenter/processCenter/finishProcess.vue
@@ -115,6 +115,7 @@ export default {
           prcNum: row.prcNum,
           prcId:  row.prcId,
           prcName:  row.prcName,
+          prcType:  row.prcType
         }
         this.$store.commit('setHandleProcess',params)
         switch (row.prcType) {
diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue
index 444475d..e8a216a 100644
--- a/src/views/userCenter/processCenter/gencyProcess.vue
+++ b/src/views/userCenter/processCenter/gencyProcess.vue
@@ -195,6 +195,7 @@ export default {
         prcNum: row.prcNum,
         prcId:  row.prcId,
         prcName:  row.prcName,
+        prcType:  row.prcType
       }
       this.$store.commit('setHandleProcess',params)
         switch (row.prcType) {