Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

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

@@ -13,10 +13,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="条码">
-          <el-input v-model="bookBarcode"></el-input>
+          <el-input v-model="formData.bookBarcode"></el-input>
         </el-form-item>
         <el-form-item label="书名">
-          <el-input v-model="bookName"></el-input>
+          <el-input v-model="formData.bookName"></el-input>
         </el-form-item>
         <el-form-item :style="{ float: 'right' }">
           <el-button type="primary" size="medium" @click="filterList">搜索</el-button>
@@ -30,7 +30,7 @@
         <el-table :data="list" border style="width: 100%">
           <el-table-column label="图片" width="128">
             <template slot-scope="scope">
-              <img width="64" :src="scope.row.BookImg" alt>
+              <img width="64" :src="scope.row.BookImg + '?x-oss-process=style/compress-rotate'" alt>
             </template>
           </el-table-column>
           <el-table-column prop="BookBarcode" label="条码"></el-table-column>
@@ -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,15 +104,17 @@
 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',
   data() {
     return {
-      caseId: '',
-      bookBarcode: '',
-      bookName: '',
+      formData: {
+        caseId: '',
+        bookBarcode: '',
+        bookName: '',
+      },
       inputRef: window.document.createElement('input'),
       showDialog: false,
     }
@@ -128,7 +130,15 @@ export default {
       page: s => s.page,
       pagenum: s => s.pagenum,
       types: s => s.type.list
-    })
+    }),
+    caseId: {
+      get() {
+        return this.formData.caseId || this.defaultCase
+      },
+      set(nv) {
+        this.formData.caseId = nv
+      }
+    },
   },
   created() {
     this.inputRef.type = 'file'
@@ -136,9 +146,16 @@ export default {
     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',
@@ -164,8 +181,8 @@ export default {
       this.getList({
         page,
         caseid: caseId,
-        barcode: this.bookBarcode,
-        name: this.bookName
+        barcode: this.formData.bookBarcode,
+        name: this.formData.bookName
       }).catch(err => {
         this.$message({
           showClose: true,
@@ -217,7 +234,6 @@ export default {
     // 设为/取消推荐
     setRecommend(book) {
       const tipMsg = book.IsRecommend === 1 ? '确定取消推荐?' : '确认设置为推荐?'
-      book.IsRecommend = Math.abs(book.IsRecommend - 1)
 
       this.$confirm(tipMsg, '提示', {
         confirmButtonText: '是',
@@ -225,6 +241,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
+          book.IsRecommend = Math.abs(book.IsRecommend - 1)
           this.setBookRecommend(book)
             .then(() => {
               this.$message({

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

@@ -23,7 +23,7 @@
         <el-table :data="list" border style="width: 100%">
           <el-table-column label="图片" width="128">
             <template slot-scope="scope">
-              <img width="64" :src="scope.row.BookTypeImg" alt>
+              <img width="64" :src="scope.row.BookTypeImg + '?x-oss-process=style/compress-rotate'" alt>
             </template>
           </el-table-column>
           <el-table-column prop="BookTypeName" label="名称"></el-table-column>
@@ -56,14 +56,15 @@ import { createNamespacedHelpers, mapState } from 'vuex'
 
 const {
   mapState: mapLibSate,
-  mapActions
+  mapActions,
+  mapMutations,
 } = createNamespacedHelpers('library')
 
 export default {
   name: 'bookTypeList',
   data() {
     return {
-      caseId: ''
+      formData: { caseid: '' },
     }
   },
   computed: {
@@ -76,20 +77,39 @@ export default {
       list: s => s.type.list,
       page: s => s.type.page,
       pagenum: s => s.type.pagenum,
-    })
+    }),
+    caseId: {
+      get() {
+        return this.formData.caseid || this.defaultCase
+      },
+      set(nv) {
+        this.formData.caseid = nv
+      },
+    }
   },
-  created() {
-    this.filterList()
+  beforeRouteLeave (to, from, next) {
+    this.resetStore('type.list')
+    next()
   },
   methods: {
+    ...mapMutations({
+      resetStore: 'clearData',
+    }),
     ...mapActions({
       getList: 'getTypeList',
       deleteType: 'deleteType',
     }),
 
     filterList({ page = 0 } = {}) {
-      const caseId = this.caseId || this.defaultCase
-      if (!caseId) return
+      const caseId = this.formData.caseId || this.defaultCase
+      if (!caseId) {
+        this.$message({
+          showClose: true,
+          message: '请选择案场',
+          type: 'error'
+        })
+        return
+      }
 
       this.getList({
         page,

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

@@ -37,9 +37,9 @@
         <el-table-column label="案场">
           <template slot-scope="scope">{{returnCaseName(scope.row.CaseId)}}</template>
         </el-table-column>
-        <el-table-column label="图片" width="300">
+        <el-table-column label="图片" width="128">
           <template slot-scope="scope">
-            <img :src="scope.row.BookImg" style="height: 150px;">
+            <img :src="scope.row.BookImg + '?x-oss-process=style/compress-rotate'" style="height: 64px;">
           </template>
         </el-table-column>
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
@@ -71,7 +71,7 @@
 
 <script>
 import { createNamespacedHelpers, mapState } from 'vuex'
-const { mapState: mapLibSate, mapActions: mapLibActions } = createNamespacedHelpers('library')
+const { mapState: mapLibSate, mapActions: mapLibActions, mapMutations } = createNamespacedHelpers('library')
 export default {
   name: 'borrowList',
   data () {
@@ -99,6 +99,10 @@ export default {
       this.total = res.pagenum
     })
   },
+  beforeRouteLeave (to, from, next) {
+    this.resetStore('borrow.list')
+    next()
+  },
   computed: {
     ...mapState({
       cases: x => x.app.cases.list,
@@ -118,6 +122,9 @@ export default {
     }
   },
   methods: {
+    ...mapMutations({
+      resetStore: 'clearData',
+    }),
     ...mapLibActions(['getBorrowList', 'cancelBorrow']),
     cancel (id) {
       this.$confirm('确认取消预约?', '提示', {

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

@@ -36,7 +36,7 @@
       <!-- 过滤条件 -->
       <el-form inline>
         <el-form-item label="案场">
-          <el-select v-model="formData.caseid" size="medium" placeholder="请选择案场">
+          <el-select v-model="caseId" size="medium" placeholder="请选择案场">
             <el-option
               v-for="item in cases"
               :key="item.CaseId"
@@ -105,13 +105,14 @@ export default {
       list: s => s.list,
       borrowHistory: s => s.borrow.history,
     }),
-  },
-  watch: {
-    defaultCase(nv) {
-      if (!this.formData.caseid) {
-        this.formData.caseid = nv
-      }
-    }
+    caseId: {
+      get() {
+        return this.formData.caseid || this.defaultCase
+      },
+      set(val) {
+        this.formData.caseid = val
+      },
+    },
   },
   methods: {
     ...mapActions({
@@ -143,7 +144,7 @@ export default {
 
     search() {
       // 必须选案场
-      if (!this.formData.caseid) {
+      if (!this.formData.caseid && !this.defaultCase) {
         this.$message({
           showClose: true,
           message: '请选择案场',
@@ -153,6 +154,10 @@ export default {
         return
       }
 
+      if (!this.formData.caseid) {
+        this.formData.caseid = this.defaultCase
+      }
+
       // 先扫码或者输入图书名称
       if (!this.formData.barcode && !this.formData.name) {
         this.$message({

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

@@ -47,9 +47,9 @@
         <el-table-column label="案场">
           <template slot-scope="scope">{{returnCaseName(scope.row.CaseId)}}</template>
         </el-table-column>
-        <el-table-column label="图片" width="300">
+        <el-table-column label="图片" width="128">
           <template slot-scope="scope">
-            <img :src="scope.row.BookImg" style="height: 150px;">
+            <img :src="scope.row.BookImg + '?x-oss-process=style/compress-rotate'" style="height: 64px;">
           </template>
         </el-table-column>
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
@@ -82,7 +82,7 @@
 
 <script>
 import { createNamespacedHelpers, mapState } from 'vuex'
-const { mapState: mapLibSate, mapActions: mapLibActions } = createNamespacedHelpers('library')
+const { mapState: mapLibSate, mapActions: mapLibActions, mapMutations } = createNamespacedHelpers('library')
 export default {
   name: 'borrowList',
   data () {
@@ -140,7 +140,14 @@ export default {
       }
     }
   },
+  beforeRouteLeave (to, from, next) {
+    this.resetStore('borrow.list')
+    next()
+  },
   methods: {
+    ...mapMutations({
+      resetStore: 'clearData',
+    }),
     ...mapLibActions(['getBorrowList']),
     search () {
       this.page = 1

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 || {}