From bc5de5f611e54fce853c697ed9338f91d2951cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 12 Jun 2023 11:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  5 ++
 jero-web/src/common/lang/zh-cn.js             |  5 ++
 jero-web/src/permission.js                    |  6 +-
 .../src/views/phoneView/recentBrowsing.vue    |  3 +
 jero-web/src/views/phoneView/searchList.vue   | 31 ++++---
 jero-web/src/views/phoneView/toDoCenter.vue   | 86 ++++++++++++++-----
 6 files changed, 97 insertions(+), 39 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 7639e3572..5490f57cb 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1877,4 +1877,9 @@ module.exports = {
   clickAndSelect:'Click and select',
   phoneCreationTime:'Creation Time',
   theCurrentFormatSupportPreview:'The current format does not support preview',
+  nearlyMonth:'Nearly a month',
+  nearlyThreeMonths:'Nearly Three Months',
+  nearlySixMonths:'Nearly Six Months',
+  nearlyYear:'Nearly a Year',
+  browsingTime:'Browsing time',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index c86841b73..e6773498d 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1978,4 +1978,9 @@ module.exports = {
   clickAndSelect:'点击选择',
   phoneCreationTime:'创建时间',
   theCurrentFormatSupportPreview:'当前格式不支持预览',
+  nearlyMonth:'近一个月',
+  nearlyThreeMonths:'近三个月',
+  nearlySixMonths:'近六个月',
+  nearlyYear:'近一年',
+  browsingTime:'浏览时间',
 }
\ No newline at end of file
diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js
index ab77712ff..9c15d3171 100644
--- a/jero-web/src/permission.js
+++ b/jero-web/src/permission.js
@@ -119,9 +119,11 @@ router.beforeEach((to, from, next) => {
             router.addRoutes(store.getters.addRouters)
             let redirect = decodeURIComponent(from.query.redirect || to.path)
             if (mobile) {
-              redirect = '/phoneSearch'
+              if (redirect == '/'){
+                redirect = '/phoneSearch'
+              }
             }
-            console.log(redirect)
+
             if (to.path === redirect) {
               // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
               next({ ...to, replace: true })
diff --git a/jero-web/src/views/phoneView/recentBrowsing.vue b/jero-web/src/views/phoneView/recentBrowsing.vue
index 30fe64857..86343e132 100644
--- a/jero-web/src/views/phoneView/recentBrowsing.vue
+++ b/jero-web/src/views/phoneView/recentBrowsing.vue
@@ -22,6 +22,9 @@
           <div class="content-text-button">
             <span>{{item.browseTypeName}}</span>
           </div>
+          <div class="content-text-button">
+          <span>{{$t('browsingTime')}}：{{item.createTime}}</span>
+          </div>
         </div>
         <div class="content-text-right">
           <van-icon name="arrow"/>
diff --git a/jero-web/src/views/phoneView/searchList.vue b/jero-web/src/views/phoneView/searchList.vue
index bc0a513ed..11fe3ed5c 100644
--- a/jero-web/src/views/phoneView/searchList.vue
+++ b/jero-web/src/views/phoneView/searchList.vue
@@ -3,22 +3,21 @@
     <div class="fixed">
       <div class="header-search">
         <van-icon @click="iconClick" class="icon" name="arrow-left"/>
-        <van-dropdown-menu v-if="activeTab == 'documentLibrary'">
-          <van-dropdown-item @change="selectModelChange" v-model="selectModel" :options="option"/>
-        </van-dropdown-menu>
-        <van-search v-model="value"
-                    class="search-text"
-                    v-if="activeTab == 'documentLibrary'"
-                    show-action
-                    left-icon="none"
-                    @search="onSearch"
-                    @clear="onClear"
-                    @cancel="onClear"
-                    :action-text="$t('reset')"
-                    :placeholder="$t('phoneSearch')"/>
+<!--        <van-dropdown-menu v-if="activeTab == 'documentLibrary'">-->
+<!--          <van-dropdown-item @change="selectModelChange" v-model="selectModel" :options="option"/>-->
+<!--        </van-dropdown-menu>-->
+<!--        <van-search v-model="value"-->
+<!--                    class="search-text"-->
+<!--                    v-if="activeTab == 'documentLibrary'"-->
+<!--                    show-action-->
+<!--                    left-icon="none"-->
+<!--                    @search="onSearch"-->
+<!--                    @clear="onClear"-->
+<!--                    @cancel="onClear"-->
+<!--                    :action-text="$t('reset')"-->
+<!--                    :placeholder="$t('phoneSearch')"/>-->
         <van-search v-model="value"
                     show-action
-                    v-else
                     @search="onSearch"
                     @clear="onClear"
                     @cancel="onClear"
@@ -37,8 +36,8 @@
     <div class="content-box">
       <div class="search-top">
         {{$t('searchScope')}}：
-        <span v-if="activeTab == 'documentLibrary' && searchValue">
-        {{selectModelName}}:</span>
+<!--        <span v-if="activeTab == 'documentLibrary' && searchValue">-->
+<!--        {{selectModelName}}:</span>-->
         <span>{{searchValue}}</span>
       </div>
 
diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue
index 49c73930d..ba29edce7 100644
--- a/jero-web/src/views/phoneView/toDoCenter.vue
+++ b/jero-web/src/views/phoneView/toDoCenter.vue
@@ -2,7 +2,7 @@
   <div class="box">
     <div class="fixed">
       <div class="header-search">
-<!--        <van-icon class="icon" name="arrow-left"/>-->
+        <!--        <van-icon class="icon" name="arrow-left"/>-->
         <van-search v-model="value"
                     @search="onSearch"
                     @clear="onClear"
@@ -152,23 +152,24 @@
             </template>
           </van-field>
           <van-field
-            readonly
-            clickable
-            name="picker"
             :value="form.value"
             class="textarea"
             :label="$t('cutoffTime')"
-            :placeholder="$t('clickAndSelect')"
-            @click="showPicker = true"
-          />
-          <van-popup v-model="showPicker" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="columns"
-              @confirm="onConfirm"
-              @cancel="showPicker = false"
-            />
-          </van-popup>
+            :placeholder="$t('clickAndSelect')">
+            <template #input>
+              <van-dropdown-menu class="cutoffTimeClass">
+                <van-dropdown-item v-model="form.selectModel" :options="columns"/>
+              </van-dropdown-menu>
+            </template>
+          </van-field>
+          <!--          <van-popup v-model="showPicker" position="bottom">-->
+          <!--            <van-picker-->
+          <!--              show-toolbar-->
+          <!--              :columns="columns"-->
+          <!--              @confirm="onConfirm"-->
+          <!--              @cancel="showPicker = false"-->
+          <!--            />-->
+          <!--          </van-popup>-->
           <van-field name="checkboxGroup" class="textarea" :label="$t('treatmentMode')">
             <template #input>
               <div class="Mode-text">
@@ -200,14 +201,35 @@
         active: 'toDoCenter',
         show: false,
         date: '',
-        columns: ['近一个月', '近三个月', '近六个月', '近一年'],
+        columns: [
+          {
+            text: this.$t('pleaseSelect'),
+            value: '0'
+          },
+          {
+            text: this.$t('nearlyMonth'),
+            value: '1'
+          },
+          {
+            text: this.$t('nearlyThreeMonths'),
+            value: '2'
+          },
+          {
+            text: this.$t('nearlySixMonths'),
+            value: '3'
+          },
+          {
+            text: this.$t('nearlyYear'),
+            value: '4'
+          }],
         showPicker: false,
         value: '',
         activeTab: '',
         language: localStorage.getItem('language'),
         form: {
-          checked: true,
-          flowType: []
+          checked: false,
+          flowType: [],
+          selectModel:'0'
         },
         toDoProcessList: [],
         toDoProcessLoading: false,
@@ -237,10 +259,10 @@
       // this.getToDoProcess()
     },
     methods: {
-      onSearch(){
+      onSearch() {
 
       },
-      onClear(){
+      onClear() {
 
       },
       onChange(value) {
@@ -260,7 +282,8 @@
       },
       resetClick() {
         this.form = {
-          checked: true
+          checked: false,
+          selectModel:'0'
         }
         this.show = false
         if (this.activeTab == 'toDoProcess') {
@@ -826,4 +849,25 @@
     font-size: 0.38rem;
     margin-left: 0.2rem;
   }
+
+  .cutoffTimeClass {
+    width: 100%;
+  }
+  ::v-deep .cutoffTimeClass .van-dropdown-menu__item{
+    justify-content: left;
+  }
+  ::v-deep .cutoffTimeClass .van-dropdown-menu__title--active {
+    color: #21c9cc;
+  }
+
+  ::v-deep .cutoffTimeClass .van-dropdown-item__option--active {
+    color: #21c9cc;
+  }
+
+  ::v-deep .cutoffTimeClass .van-dropdown-item__option--active .van-dropdown-item__icon {
+    color: #21c9cc;
+  }
+  ::v-deep .cutoffTimeClass .van-dropdown-menu__bar{
+    box-shadow: none;
+  }
 </style>
\ No newline at end of file