From 5b67bf3c183e6979d34fe0df06ad4b6b3fd181fd Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Sat, 5 Mar 2022 11:52:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Standardselection/index.vue    | 51 ++++++++++---------
 jero-web/src/components/addForm/index.vue     |  8 +--
 jero-web/src/components/layouts/Tabcrumbs.vue |  6 +--
 jero-web/src/components/tools/UserMenu.vue    | 10 +---
 4 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue
index bfa69c947..6306badcc 100644
--- a/jero-web/src/components/Standardselection/index.vue
+++ b/jero-web/src/components/Standardselection/index.vue
@@ -17,32 +17,35 @@
       @close="handleCancel"
       :visible="visible"
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
-      <currencySearch
-        :flag="'1'"
-        :url="url"
-        @searchQuery="searchQuery"
-        @searchReset="searchReset"
-      />
-      <a-table
-        :columns="columns"
-        rowKey="id"
-        :data-source="dataList"
-        :scroll="{ y: 540 }"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        :loading="loading">
-
-      </a-table>
-      <div class="page" v-if="dataList.length > 0">
-        <a-pagination
-          :show-total="total => $t('total')+`${total}`+$t('strip')"
-          show-quick-jumper
-          show-size-changer
-          :page-size.sync="pageSize"
-          :total="total"
-          @change="onChange"
-          @showSizeChange="SizeChange"
+      <div style="margin-bottom: 60px">
+        <currencySearch
+          :flag="'1'"
+          :url="url"
+          @searchQuery="searchQuery"
+          @searchReset="searchReset"
         />
+        <a-table
+          :columns="columns"
+          rowKey="id"
+          :data-source="dataList"
+          :pagination="false"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          :loading="loading">
+
+        </a-table>
+        <div class="page" v-if="dataList.length > 0">
+          <a-pagination
+            :show-total="total => $t('total')+`${total}`+$t('strip')"
+            show-quick-jumper
+            show-size-changer
+            :page-size.sync="pageSize"
+            :total="total"
+            @change="onChange"
+            @showSizeChange="SizeChange"
+          />
+        </div>
       </div>
+
       <div class="drawer-bootom-button">
         <a-button @click="handleCancel" type="danger" style="margin-right: 16px">{{$t('cancel')}}</a-button>
         <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
diff --git a/jero-web/src/components/addForm/index.vue b/jero-web/src/components/addForm/index.vue
index d3322a834..16dbf30d8 100644
--- a/jero-web/src/components/addForm/index.vue
+++ b/jero-web/src/components/addForm/index.vue
@@ -173,7 +173,7 @@
             </div>
           </a-col>
 
-          <a-col :span="12" v-else-if="item.field_show_type === 'treeSelect'">
+          <a-col :span="12" v-else-if="item.field_show_type === '0'">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -182,11 +182,11 @@
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
                 <a-tree-select
                   v-model="formInline[item.db_field_name]"
-                  style="width: 100%"
                   :maxTagCount="1"
-                  :tree-data="treeData"
+                  style="width: 100%"
+                  :tree-data="item.tree"
                   tree-checkable
-                  placeholder="Please select"
+                  :placeholder="$t('PleaseSelect')+item.db_field_txt"
                 />
               </a-form-model-item>
             </div>
diff --git a/jero-web/src/components/layouts/Tabcrumbs.vue b/jero-web/src/components/layouts/Tabcrumbs.vue
index 8c3ba7aeb..eccedcb5c 100644
--- a/jero-web/src/components/layouts/Tabcrumbs.vue
+++ b/jero-web/src/components/layouts/Tabcrumbs.vue
@@ -25,9 +25,9 @@
       }
     },
     watch: {
-      '$route': function(to,form) {
-        if (to.meta.title == '首页') {
-          this.Navigation = to.meta.title
+      '$route': function(val) {
+        if (val.meta.title == '首页') {
+          this.Navigation = val.meta.title
           this.subNavigation = null
         } else {
           this.updateMenu()
diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index e68d1e684..f6942588b 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -119,6 +119,7 @@
   import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
   import enUS from 'ant-design-vue/es/locale/en_US'
   import 'moment/locale/zh-cn'
+  import { generateIndexRouter } from '@/utils/util'
   import store from '../../store'
   import router from '../../router'
 
@@ -301,15 +302,6 @@
             localStorage.setItem('language', 'en-us')
             break
         }
-        router.beforeEach((to,from,next)=>{
-          console.log(to)
-          console.log(from)
-          return
-          if(to.meta.title){
-            document.title=to.meta.title
-          }
-          next()
-        })
         store.dispatch('GetPermissionList').then(res => {
           this.$root.Bus.$emit('switchLanguage', localeval)
           this.isLoading = false