zhangyu 4 лет назад
Родитель
Сommit
f8888e07f4

+ 1 - 0
src/components/model/file/addFloorDialog.vue

@@ -50,6 +50,7 @@
               style="margin-left:10px;"
               v-model="form.floorNum"
               :min="1"
+              :max="999"
               :disabled="form.floorTypeVal == 'RF'"
               @change="handleChange"
             ></el-input-number>

+ 1 - 1
src/components/model/file/floorTable.vue

@@ -14,7 +14,7 @@
           <span style="margin-left: 10px">{{ scope.row.FloorName }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="Note" label="备注" width="240"></el-table-column>
+      <el-table-column prop="Note" label="备注" :show-overflow-tooltip="true" width="240"></el-table-column>
       <el-table-column label="版本号">
         <template slot-scope="scope">
           <span style="margin-right: 5px">{{ scope.row.Version }}</span>

+ 6 - 3
src/utils/authutils.js

@@ -51,9 +51,6 @@ export default {
                 store.commit('setLastRoute', lastRoute)
                 toLogin()
             } else {
-                if (to.meta.breadcrumbs) {
-                    store.dispatch('setBreadcrumb', to.meta.breadcrumbs)
-                }
                 if(
                     (from.path == "/ledger/rentadd" && session.get("rentAddData") && session.get("rentAddData").length) ||
                     (from.path == "/ledger/cenoteadd" && session.get("cenoteAddData") && session.get("cenoteAddData").length) ||
@@ -71,11 +68,17 @@ export default {
                         let arr = from.path.split("/")
                         let srt = arr[arr.length - 1].slice(0,-3)
                         session.remove(`${srt}AddData`)
+                        if (to.meta.breadcrumbs) {
+                            store.dispatch('setBreadcrumb', to.meta.breadcrumbs)
+                        }
                         next()
                     }).catch(() => {
                         next(false)
                     })
                 } else {
+                    if (to.meta.breadcrumbs) {
+                        store.dispatch('setBreadcrumb', to.meta.breadcrumbs)
+                    }
                     next()
                 }
             }