Merge remote-tracking branch 'origin/dev_20230526_Mobile' into dev_20230526_Mobile

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)

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({

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"

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)

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(() => {

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') {

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 {