From 2661a01be4d89eb6a4d424fbcad9cf544ab81ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 20 Jun 2023 16:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E4=B8=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E9=A1=B5=E7=AD=BE=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E9=83=BD=E4=B8=8D=E8=A2=AB=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/phoneView/documentDetails.vue   |  6 ++++-
 jero-web/src/views/phoneView/handlingPage.vue | 12 ++++++++-
 .../src/views/phoneView/preHomoMangement.vue  |  4 ++-
 .../views/phoneView/problemKnowledgeBase.vue  |  6 ++++-
 .../src/views/phoneView/processManagement.vue | 14 ++++++++--
 jero-web/src/views/phoneView/searchList.vue   |  8 ++++--
 jero-web/src/views/phoneView/toDoCenter.vue   | 27 ++++++++++++++-----
 7 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/views/phoneView/documentDetails.vue b/jero-web/src/views/phoneView/documentDetails.vue
index 54f55a5da..ba0c63afb 100644
--- a/jero-web/src/views/phoneView/documentDetails.vue
+++ b/jero-web/src/views/phoneView/documentDetails.vue
@@ -150,7 +150,11 @@
       iconClick() {
         if (this.$route.query.goRouter) {
           this.$router.push({
-            path: this.$route.query.goRouter
+            path: this.$route.query.goRouter,
+            query: {
+              searchValue: this.$route.query.searchValue,
+              activeTab: this.$route.query.activeTab
+            }
           })
         } else {
           this.$router.go(-1)
diff --git a/jero-web/src/views/phoneView/handlingPage.vue b/jero-web/src/views/phoneView/handlingPage.vue
index 2ab8211cf..36423dc24 100644
--- a/jero-web/src/views/phoneView/handlingPage.vue
+++ b/jero-web/src/views/phoneView/handlingPage.vue
@@ -60,7 +60,17 @@
     },
     methods: {
       iconClick() {
-        this.$router.go(-1)
+        if (this.$route.query.goRouter) {
+          this.$router.push({
+            path: this.$route.query.goRouter,
+            query: {
+              searchValue: this.$route.query.searchValue,
+              activeTab: this.$route.query.activeTab
+            }
+          })
+        } else {
+          this.$router.go(-1)
+        }
       },
       handlingClick(item) {
         this.$router.push({
diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue
index 1dc26f59f..d477cd5c6 100644
--- a/jero-web/src/views/phoneView/preHomoMangement.vue
+++ b/jero-web/src/views/phoneView/preHomoMangement.vue
@@ -56,7 +56,9 @@
         <div class="content-box-type-text">
           {{$t('deliverableTemplate')}}
         </div>
-        <div class="content-box-type-text-one" v-if="dataSourceFile && dataSourceFile.length == 0">
+        <div class="content-box-type-text-one"
+             style="color: #040B29"
+             v-if="dataSourceFile && dataSourceFile.length == 0">
           --
         </div>
         <div class="content-box-type-text-one"
diff --git a/jero-web/src/views/phoneView/problemKnowledgeBase.vue b/jero-web/src/views/phoneView/problemKnowledgeBase.vue
index 586df8389..23e825b12 100644
--- a/jero-web/src/views/phoneView/problemKnowledgeBase.vue
+++ b/jero-web/src/views/phoneView/problemKnowledgeBase.vue
@@ -209,7 +209,11 @@
       iconClick() {
         if (this.$route.query.goRouter) {
           this.$router.push({
-            path: this.$route.query.goRouter
+            path: this.$route.query.goRouter,
+            query: {
+              searchValue: this.$route.query.searchValue,
+              activeTab: this.$route.query.activeTab
+            }
           })
         } else {
           this.$router.go(-1)
diff --git a/jero-web/src/views/phoneView/processManagement.vue b/jero-web/src/views/phoneView/processManagement.vue
index e9b20e386..68d8fabae 100644
--- a/jero-web/src/views/phoneView/processManagement.vue
+++ b/jero-web/src/views/phoneView/processManagement.vue
@@ -51,7 +51,7 @@
         <div class="content-box-type-text">
           {{$t('deliverableTemplate')}}
         </div>
-        <div class="content-box-type-text-one" v-if="dataSourceFile && dataSourceFile.length == 0">
+        <div class="content-box-type-text-Two" v-if="dataSourceFile && dataSourceFile.length == 0">
           --
         </div>
         <div class="content-box-type-text-one"
@@ -265,7 +265,17 @@
         kkFileView(item.approvalFileName[index], item.approvalFile[index])
       },
       iconClick() {
-        this.$router.go(-1)
+        if (this.$route.query.goRouter) {
+          this.$router.push({
+            path: this.$route.query.goRouter,
+            query: {
+              searchValue: this.$route.query.searchValue,
+              activeTab: this.$route.query.activeTab
+            }
+          })
+        } else {
+          this.$router.go(-1)
+        }
       },
       onSubmit() {
         this.$refs.form.validate().then(() => {
diff --git a/jero-web/src/views/phoneView/searchList.vue b/jero-web/src/views/phoneView/searchList.vue
index ed702c677..87b2ab4b7 100644
--- a/jero-web/src/views/phoneView/searchList.vue
+++ b/jero-web/src/views/phoneView/searchList.vue
@@ -349,7 +349,9 @@
             path: '/phoneDocumentDetails',
             query: {
               id: item.id.slice(0, 32),
-              goRouter: '/phoneSearchList'
+              goRouter: '/phoneSearchList',
+              searchValue:this.value,
+              activeTab:this.activeTab
             }
           })
         } else if (item.module_type_flag == 'WTZSK' || item.module_type_flag == 'ZSFX') {
@@ -359,7 +361,9 @@
             path: '/phoneProblemKnowledgeBase',
             query: {
               id: id,
-              goRouter: '/phoneSearchList'
+              goRouter: '/phoneSearchList',
+              searchValue:this.value,
+              activeTab:this.activeTab
             }
           })
         } else if (item.module_type_flag == 'FGYB') {
diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue
index 0f0106c99..ff0bdbc17 100644
--- a/jero-web/src/views/phoneView/toDoCenter.vue
+++ b/jero-web/src/views/phoneView/toDoCenter.vue
@@ -3,7 +3,7 @@
     <div class="fixed">
       <div class="header-search">
         <!--        <van-icon class="icon" name="arrow-left"/>-->
-        <form action="/">
+        <form action="/" style="width: 100%;">
           <van-search v-model="phoneQueryValue"
                       @search="onSearch"
                       @clear="onClear"
@@ -266,12 +266,12 @@
         processDoneList: [],
         processDoneLoading: false,
         processDoneFinished: false,
-        processDonePageNo: 1,
+        processDonePageNo: 0,
         processDonePageSize: 10,
         sentProcessList: [],
         sentProcessLoading: false,
         sentProcessFinished: false,
-        sentProcessPageNo: 1,
+        sentProcessPageNo: 0,
         sentProcessPageSize: 10,
         phoneQueryValue: ''
       }
@@ -283,6 +283,12 @@
         this.form.flowType.push(this.$route.query.flowType)
         this.form = { ...this.form }
       }
+      if (this.$route.query.searchValue){
+          this.phoneQueryValue = this.$route.query.searchValue
+      }
+      if (this.$route.query.activeTab) {
+        this.activeTab = this.$route.query.activeTab
+      }
       // this.toDoProcessPageNo = 1
       // this.getToDoProcess()
     },
@@ -468,7 +474,10 @@
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
             DueDate: 'designDueDate',
-            remarks: 'designRemark'
+            remarks: 'designRemark',
+            goRouter: '/phoneToDoCenter',
+            searchValue:this.phoneQueryValue,
+            activeTab:this.activeTab
           }
           this.$router.push({
             path: '/phoneProcessManagement',
@@ -488,7 +497,10 @@
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
             DueDate: 'verifyDueDate',
-            remarks: 'verifyRemark'
+            remarks: 'verifyRemark',
+            goRouter: '/phoneToDoCenter',
+            searchValue:this.phoneQueryValue,
+            activeTab:this.activeTab
           }
           this.$router.push({
             path: '/phoneProcessManagement',
@@ -504,7 +516,10 @@
                 projectLibraryId: row.projectLibraryId,
                 taskDefinitionKey: row.taskDefinitionKey,
                 isDisplay: isTrue,
-                projectName: row.projectName
+                projectName: row.projectName,
+                goRouter: '/phoneToDoCenter',
+                searchValue:this.phoneQueryValue,
+                activeTab:this.activeTab
               }
             })
           } else {