bug fix

src/pages/system/library/books/detail.vue

@@ -153,9 +153,14 @@ export default {
       immediate: true,
     },
   },
+  beforeRouteLeave (to, from, next) {
+    this.resetStore('detail')
+    next()
+  },
   methods: {
     ...mapMutations({
-      mergeDetail: 'mergeBookDetail'
+      mergeDetail: 'mergeBookDetail',
+      resetStore: 'clearData',
     }),
     ...mapActions({
       getInfo: 'getBookDetail',

src/pages/system/library/books/list.vue

@@ -52,7 +52,7 @@
           </el-table-column>
           <el-table-column prop="BorrowDays" label="借阅(天)"></el-table-column>
           <el-table-column prop="InStock" label="总数量"></el-table-column>
-          <el-table-column prop="LeftNum" label="借出"></el-table-column>
+          <el-table-column prop="BorrowNum" label="借出"></el-table-column>
           <el-table-column label="预约">
             <template slot-scope="scope">
               <span>{{ getReserveNum(scope.row) }}</span>
@@ -104,7 +104,7 @@
 import { createNamespacedHelpers, mapState } from 'vuex'
 import { Loading } from 'element-ui'
 
-const { mapState: mapLibSate, mapActions } = createNamespacedHelpers('library')
+const { mapState: mapLibSate, mapActions, mapMutations } = createNamespacedHelpers('library')
 
 export default {
   name: 'bookList',
@@ -130,15 +130,30 @@ export default {
       types: s => s.type.list
     })
   },
+  watch: {
+    defaultCase(nv) {
+      if (nv && !this.caseId) {
+        this.caseId = nv
+        this.filterList()
+      }
+    },
+  },
   created() {
     this.inputRef.type = 'file'
     // https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Complete_list_of_MIME_types
     this.inputRef.accept = 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
     this.inputRef.addEventListener('change', this.importBatch.bind(this))
 
-    this.filterList()
+    // this.filterList()
+  },
+  beforeRouteLeave (to, from, next) {
+    this.resetStore('list')
+    next()
   },
   methods: {
+    ...mapMutations({
+      resetStore: 'clearData',
+    }),
     ...mapActions({
       getList: 'getBookList',
       getTypeList: 'getTypeList',

src/pages/system/library/books/types/detail.vue

@@ -88,22 +88,19 @@ export default {
           return
         }
 
+        if (!this.$route.params.id) {
+          return
+        }
+
         let CaseId = nv.CaseId
         if (!CaseId) {
           CaseId = this.defaultCase
         }
 
         this.formData = { ...nv, CaseId }
-        // this.mergeDetail(nv)
       },
       immediate: true,
-    },
-    // formData: {
-    //   handler (nv) {
-    //     this.mergeDetail(nv)
-    //   },
-    //   deep: true,
-    // },
+    }
   },
   methods: {
     ...mapMutations({
@@ -129,6 +126,8 @@ export default {
                 message: '更新或编辑分类成功',
                 type: 'success'
               })
+
+              this.$router.push({ name: 'libraryType' })
             })
             .catch(err => {
               this.$message({

src/pages/system/library/books/types/list.vue

@@ -56,7 +56,8 @@ import { createNamespacedHelpers, mapState } from 'vuex'
 
 const {
   mapState: mapLibSate,
-  mapActions
+  mapActions,
+  mapMutations,
 } = createNamespacedHelpers('library')
 
 export default {
@@ -78,10 +79,22 @@ export default {
       pagenum: s => s.type.pagenum,
     })
   },
-  created() {
-    this.filterList()
+  watch: {
+    defaultCase(nv) {
+      if (nv && !this.caseId) {
+        this.caseId = nv
+        this.filterList()
+      }
+    },
+  },
+  beforeRouteLeave (to, from, next) {
+    this.resetStore('type.list')
+    next()
   },
   methods: {
+    ...mapMutations({
+      resetStore: 'clearData',
+    }),
     ...mapActions({
       getList: 'getTypeList',
       deleteType: 'deleteType',

src/pages/system/library/borrow/borrow.vue

@@ -108,7 +108,7 @@ export default {
   },
   watch: {
     defaultCase(nv) {
-      if (!this.formData.caseid) {
+      if (nv && !this.formData.caseid) {
         this.formData.caseid = nv
       }
     }

src/store/library/index.js

@@ -30,6 +30,28 @@ export default {
     },
   },
   mutations: {
+    clearData(state, key = '') {
+      if (!key) return
+
+      const ks = key.split('.')
+      const lastInx = ks.length - 1
+
+      ks.reduce((acc, it, inx) => {
+        if (inx === lastInx) {
+          if (it === 'list') {
+            acc[it] = []
+          } else if (it === 'detail') {
+            acc[it] = {}
+          } else if (it.indexOf('page') > -1) {
+            acc[it] = 1
+          } else {
+            acc[it] = undefined
+          }
+        }
+
+        return acc[it]
+      }, state)
+    },
     mergeTypeDetail (state, payload) {
       state.type.detail = payload || {}