Merge branch 'master' into 'dev_20230526_Mobile'

# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
#   jero-web/src/components/tools/UserMenu.vue

jero-web/src/views/phoneView/toDoCenter.vue

@@ -458,8 +458,9 @@
       },
       toDoCenterClick(row, isTrue) {
         let query = {}
-        if (!this.form.flowType) {
-          this.form.flowType = []
+        let flowType = ''
+        if (this.form.flowType && this.form.flowType instanceof Array){
+          flowType = this.form.flowType.join(',')
         }
         row.taskId = row.taskId + ''
         if (row.taskId.length > 30) {
@@ -488,7 +489,7 @@
             activeTab: this.activeTab,
             checked: this.form.checked,
             selectModel: this.form.selectModel,
-            searchFlowType: this.form.flowType.join(',')
+            searchFlowType: flowType
           }
           this.$router.push({
             path: '/phoneProcessManagement',
@@ -512,7 +513,7 @@
             goRouter: '/phoneToDoCenter',
             searchValue: this.phoneQueryValue,
             activeTab: this.activeTab,
-            searchFlowType: this.form.flowType.join(','),
+            searchFlowType: flowType,
             checked: this.form.checked,
             selectModel: this.form.selectModel
           }
@@ -534,7 +535,7 @@
                 goRouter: '/phoneToDoCenter',
                 searchValue: this.phoneQueryValue,
                 activeTab: this.activeTab,
-                searchFlowType: this.form.flowType.join(','),
+                searchFlowType: flowType,
                 checked: this.form.checked,
                 selectModel: this.form.selectModel
               }